From 24b637876fcf327dc9a455afa74a0ec2dced388c Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Thu, 20 Feb 2014 13:38:12 +0100
Subject: [PATCH] Substitute MXParser with a call to XmlPullParserFactory

This makes Smack more portable, as there are platforms that support the
XmlPullParser interface, but not MXParser (e.g. Android).

Also enable checkstyle check that MXParser is not used.
---
 .../main/java/org/jivesoftware/smack/BOSHPacketReader.java  | 4 ++--
 config/checkstyle.xml                                       | 4 ++++
 .../org/jivesoftware/smack/packet/PrivacyProviderTest.java  | 4 ++--
 .../java/org/jivesoftware/smack/test/SmackTestCase.java     | 4 ++--
 .../java/org/jivesoftware/smack/util/XMPPErrorTest.java     | 4 ++--
 .../java/org/jivesoftware/smack/DefaultRosterStore.java     | 4 ++--
 core/src/main/java/org/jivesoftware/smack/PacketReader.java | 4 ++--
 .../java/org/jivesoftware/smack/SmackConfiguration.java     | 4 ++--
 .../org/jivesoftware/smack/provider/ProviderFileLoader.java | 4 ++--
 core/src/test/java/org/jivesoftware/smack/RosterTest.java   | 6 +++---
 .../java/org/jivesoftware/smack/test/util/TestUtils.java    | 5 +++--
 .../org/jivesoftware/smackx/ExtensionsStartupClasses.java   | 4 ++--
 .../smackx/caps/cache/SimpleDirectoryPersistentCache.java   | 4 ++--
 .../smackx/bytestreams/ibb/provider/OpenIQProviderTest.java | 4 ++--
 .../smackx/delay/provider/DelayInformationTest.java         | 4 ++--
 .../jivesoftware/smackx/receipts/DeliveryReceiptTest.java   | 4 ++--
 .../org/jivesoftware/smackx/jingle/nat/STUNResolver.java    | 4 ++--
 .../jivesoftware/smackx/workgroup/ext/macros/Macros.java    | 4 ++--
 18 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java b/bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java
index ac139bca9..91aeaab33 100644
--- a/bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java
+++ b/bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java
@@ -23,7 +23,7 @@ import org.jivesoftware.smack.sasl.SASLMechanism.Challenge;
 import org.jivesoftware.smack.sasl.SASLMechanism.Failure;
 import org.jivesoftware.smack.sasl.SASLMechanism.Success;
 import org.jivesoftware.smack.util.PacketParserUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.igniterealtime.jbosh.AbstractBody;
 import org.igniterealtime.jbosh.BOSHClientResponseListener;
@@ -66,7 +66,7 @@ public class BOSHPacketReader implements BOSHClientResponseListener {
                 if (connection.authID == null) {
                     connection.authID = body.getAttribute(BodyQName.create(BOSHConnection.BOSH_URI, "authid"));
                 }
-                final XmlPullParser parser = new MXParser();
+                final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
                 parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES,
                         true);
                 parser.setInput(new StringReader(body.toXML()));
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index ec3a64ab5..0762b869c 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -14,6 +14,10 @@
 	<module name="NewlineAtEndOfFile">
 		<property name="lineSeparator" value="lf"/>
 	</module>
+	<module name="RegexpSingleline">
+		<property name="format" value="MXParser"/>
+		<property name="message" value="Must not use MXParser, use XmlPullParserFactory instead"/>
+	</module>
 	<module name="TreeWalker">
 		<module name="UnusedImports">
 			<property name="processJavadoc" value="true"/>
diff --git a/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java b/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
index 5ac097e6d..824b6e866 100644
--- a/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
+++ b/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
@@ -16,7 +16,7 @@ package org.jivesoftware.smack.packet;
 
 import org.jivesoftware.smack.provider.PrivacyProvider;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -372,7 +372,7 @@ public class PrivacyProviderTest extends SmackTestCase {
     }
     
     private XmlPullParser getParserFromXML(String xml) throws XmlPullParserException {
-    	MXParser parser = new MXParser();
+    	XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
     	parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
     	parser.setInput(new StringReader(xml));
     	return parser;
diff --git a/core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java b/core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
index a8a8bdb5b..9bc23ee83 100644
--- a/core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
+++ b/core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
@@ -32,7 +32,7 @@ import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.util.ConnectionUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
@@ -411,7 +411,7 @@ public abstract class SmackTestCase extends TestCase {
         InputStream systemStream = null;
         try {
             systemStream = url.openStream();
-            XmlPullParser parser = new MXParser();
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(systemStream, "UTF-8");
             int eventType = parser.getEventType();
diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java b/core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
index 000741d55..6f62c1558 100644
--- a/core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
+++ b/core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
@@ -20,7 +20,7 @@ import java.io.StringReader;
 
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -191,7 +191,7 @@ public class XMPPErrorTest extends SmackTestCase {
     }
     
     private XmlPullParser getParserFromXML(String xml) throws XmlPullParserException {
-    	MXParser parser = new MXParser();
+    	XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
     	parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
     	parser.setInput(new StringReader(xml));
     	return parser;
diff --git a/core/src/main/java/org/jivesoftware/smack/DefaultRosterStore.java b/core/src/main/java/org/jivesoftware/smack/DefaultRosterStore.java
index cd96d9666..95955f6a7 100644
--- a/core/src/main/java/org/jivesoftware/smack/DefaultRosterStore.java
+++ b/core/src/main/java/org/jivesoftware/smack/DefaultRosterStore.java
@@ -32,7 +32,7 @@ import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.packet.RosterPacket.Item;
 import org.jivesoftware.smack.util.Base32Encoder;
 import org.jivesoftware.smack.util.StringUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -200,7 +200,7 @@ public class DefaultRosterStore implements RosterStore {
         List<String> groupNames = new ArrayList<String>();
 
         try {
-            XmlPullParser parser = new MXParser();
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setInput(new StringReader(s));
 
             boolean done = false;
diff --git a/core/src/main/java/org/jivesoftware/smack/PacketReader.java b/core/src/main/java/org/jivesoftware/smack/PacketReader.java
index 3c0d1e4ac..fd73cab7f 100644
--- a/core/src/main/java/org/jivesoftware/smack/PacketReader.java
+++ b/core/src/main/java/org/jivesoftware/smack/PacketReader.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smack.sasl.SASLMechanism.Failure;
 import org.jivesoftware.smack.sasl.SASLMechanism.Success;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -152,7 +152,7 @@ class PacketReader {
      */
     private void resetParser() {
         try {
-            parser = new MXParser();
+            parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(connection.reader);
         }
diff --git a/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index 009c5e6cf..c02ca4189 100644
--- a/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -31,7 +31,7 @@ import org.jivesoftware.smack.initializer.SmackInitializer;
 import org.jivesoftware.smack.parsing.ExceptionThrowingCallback;
 import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
 import org.jivesoftware.smack.util.FileUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -430,7 +430,7 @@ public final class SmackConfiguration {
     }
 
     private static void readFile(InputStream cfgFileStream) throws Exception {
-        XmlPullParser parser = new MXParser();
+        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         parser.setInput(cfgFileStream, "UTF-8");
         int eventType = parser.getEventType();
diff --git a/core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java b/core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
index d8b9e6109..dabb94718 100644
--- a/core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
+++ b/core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.PacketExtension;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
@@ -83,7 +83,7 @@ public class ProviderFileLoader implements ProviderLoader {
         
         // Load processing providers.
         try {
-            XmlPullParser parser = new MXParser();
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(providerStream, "UTF-8");
             int eventType = parser.getEventType();
diff --git a/core/src/test/java/org/jivesoftware/smack/RosterTest.java b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
index 9c2319b17..81de1ffa8 100644
--- a/core/src/test/java/org/jivesoftware/smack/RosterTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
@@ -35,7 +35,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
@@ -315,7 +315,7 @@ public class RosterTest {
         final String contactJID = "nurse@example.com";
         final Roster roster = connection.getRoster();
         assertNotNull("Can't get the roster from the provided connection!", roster);
-        final MXParser parser = new MXParser();
+        final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         final StringBuilder sb = new StringBuilder();
         sb.append("<iq id=\"rostertest1\" type=\"set\" ")
@@ -449,7 +449,7 @@ public class RosterTest {
         final String contactJID = "nurse@example.com";
         final Roster roster = connection.getRoster();
         assertNotNull("Can't get the roster from the provided connection!", roster);
-        final MXParser parser = new MXParser();
+        final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         final StringBuilder sb = new StringBuilder();
         sb.append("<iq id=\"rostertest2\" type=\"set\" ")
diff --git a/core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java b/core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
index caadb2513..ebfca81af 100644
--- a/core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
+++ b/core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.test.util;
 import java.io.IOException;
 import java.io.StringReader;
 
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -40,8 +40,9 @@ final public class TestUtils {
     }
 
     public static XmlPullParser getParser(String stanza, String startTag) {
-        XmlPullParser parser = new MXParser();
+        XmlPullParser parser;
         try {
+            parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(new StringReader(stanza));
             boolean found = false;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
index ab5a10937..dd36d539d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.initializer.SmackInitializer;
 import org.jivesoftware.smack.util.FileUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 public class ExtensionsStartupClasses implements SmackInitializer {
@@ -41,7 +41,7 @@ public class ExtensionsStartupClasses implements SmackInitializer {
         int eventType;
         try {
             is = FileUtils.getStreamForUrl(EXTENSIONS_XML, null);
-            parser = new MXParser();
+            parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(is, "UTF-8");
             eventType = parser.getEventType();
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
index 592a984fd..78679c764 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
@@ -34,7 +34,7 @@ import org.jivesoftware.smack.util.StringEncoder;
 import org.jivesoftware.smackx.caps.EntityCapsManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.disco.provider.DiscoverInfoProvider;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -159,7 +159,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
         Reader reader = new StringReader(fileContent);
         XmlPullParser parser;
         try {
-            parser = new MXParser();
+            parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(reader);
         } catch (XmlPullParserException xppe) {
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
index 4ec1eceda..b2159d305 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaTyp
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider;
 import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -76,7 +76,7 @@ public class OpenIQProviderTest {
 
     private XmlPullParser getParser(String control) throws XmlPullParserException,
                     IOException {
-        XmlPullParser parser = new MXParser();
+        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setInput(new StringReader(control));
         while (true) {
             if (parser.next() == XmlPullParser.START_TAG
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
index 04d580bae..3cecc500e 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
@@ -33,7 +33,7 @@ import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import org.jivesoftware.smackx.delay.provider.DelayInfoProvider;
 import org.jivesoftware.smackx.delay.provider.DelayInformationProvider;
 import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -237,7 +237,7 @@ public class DelayInformationTest {
     
     private XmlPullParser getParser(String control, String startTag)
                     throws XmlPullParserException, IOException {
-        XmlPullParser parser = new MXParser();
+        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         parser.setInput(new StringReader(control));
 
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index b07bbd4f4..031a95105 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -32,7 +32,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -132,7 +132,7 @@ public class DeliveryReceiptTest {
 
     private XmlPullParser getParser(String control, String startTag)
                     throws XmlPullParserException, IOException {
-        XmlPullParser parser = new MXParser();
+        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         parser.setInput(new StringReader(control));
         while (true) {
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
index 85ebfb69c..302366f79 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleSession;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -138,7 +138,7 @@ public class STUNResolver extends TransportResolver {
         int serverPort;
 
         try {
-            XmlPullParser parser = new MXParser();
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(stunConfigStream, "UTF-8");
 
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
index a3171b8bf..b3af9508f 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
@@ -22,7 +22,7 @@ import java.io.StringReader;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
-import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
@@ -179,7 +179,7 @@ public class Macros extends IQ {
         public MacroGroup parseMacroGroups(String macros) throws Exception {
 
         	MacroGroup group = null;
-        	XmlPullParser parser = new MXParser();
+        	XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
         	parser.setInput(new StringReader(macros));
 			int eventType = parser.getEventType();
 			while (eventType != XmlPullParser.END_DOCUMENT) {