diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
index db4c84ef9..e9c9e079b 100644
--- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
+++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
@@ -25,8 +25,8 @@
 import java.io.File;
 import java.util.Properties;
 
-import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -43,7 +43,7 @@ public static void main(String[] args) throws Exception {
 
         parseArgumentsFromCommandLine(args);
 
-        modello.generate(ReaderFactory.newXmlReader(modelFile), outputType, parameters);
+        modello.generate(new XmlStreamReader(modelFile), outputType, parameters);
     }
 
     public static void parseArgumentsFromCommandLine(String[] args) throws Exception {
diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java
index fc5054e28..94389eb74 100644
--- a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java
+++ b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java
@@ -53,7 +53,7 @@
 import org.codehaus.modello.model.ModelInterface;
 import org.codehaus.modello.model.ModelValidationException;
 import org.codehaus.modello.plugin.ModelloGenerator;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -74,7 +74,7 @@ public MetadataPluginManager getMetadataPluginManager() {
     }
 
     public Model loadModel(File file) throws IOException, ModelloException, ModelValidationException {
-        try (Reader reader = ReaderFactory.newXmlReader(file)) {
+        try (Reader reader = new XmlStreamReader(file)) {
             return loadModel(reader);
         }
     }
diff --git a/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java b/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java
index 756e982c0..abaa4f824 100644
--- a/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java
+++ b/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java
@@ -6,7 +6,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.hamcrest.core.StringStartsWith;
 
@@ -28,7 +28,7 @@ public void testXpp3ParsingWithModelWithWrongRootTag()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
 
     @Test
@@ -41,7 +41,7 @@ public void testXpp3ParsingWithModelWithMissingElements()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
     
     @Test
@@ -55,7 +55,7 @@ public void testXpp3ParsingWithModelWithPostTags()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
 
 }
diff --git a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java
index 8eba0cb7a..1133e5807 100644
--- a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java
+++ b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java
@@ -52,7 +52,6 @@
 import org.codehaus.modello.plugin.java.javasource.JType;
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
-import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Generate a basic conversion class between two versions of a model.
@@ -310,18 +309,10 @@ private void generateConverters(Version toVersion) throws ModelloException, IOEx
             sc.add("return value;");
         }
 
-        JSourceWriter interfaceWriter = null;
-        JSourceWriter classWriter = null;
-
-        try {
-            interfaceWriter = newJSourceWriter(packageName, conversionInterface.getName(true));
-            classWriter = newJSourceWriter(packageName, basicConverterClass.getName(true));
-
+        try (JSourceWriter interfaceWriter = newJSourceWriter(packageName, conversionInterface.getName(true));
+                JSourceWriter classWriter = newJSourceWriter(packageName, basicConverterClass.getName(true))) {
             conversionInterface.print(interfaceWriter);
             basicConverterClass.print(classWriter);
-        } finally {
-            IOUtil.close(classWriter);
-            IOUtil.close(interfaceWriter);
         }
     }
 
@@ -351,12 +342,8 @@ private void generateConverterTool(List<Version> allVersions) throws ModelloExce
         }
         writeConvertMethod(converterClass, objectModel, basePackage, allVersions, null, rootClass);
 
-        JSourceWriter classWriter = null;
-        try {
-            classWriter = newJSourceWriter(packageName, converterClass.getName(true));
+        try (JSourceWriter classWriter = newJSourceWriter(packageName, converterClass.getName(true))) {
             converterClass.print(new JSourceWriter(classWriter));
-        } finally {
-            IOUtil.close(classWriter);
         }
     }
 
diff --git a/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java b/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
index 0b03fe251..742c29f43 100644
--- a/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
+++ b/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
@@ -35,7 +35,7 @@
 import org.codehaus.modello.test.model.io.dom4j.MavenDom4jWriter;
 import org.codehaus.modello.verifier.Verifier;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.dom4j.DocumentException;
 
@@ -80,7 +80,7 @@ public void verifyEncodedRead()
     {
         String path = "src/test/verifiers/dom4j/expected-encoding.xml";
 
-        Reader reader = ReaderFactory.newXmlReader( new File( path ) );
+        Reader reader = new XmlStreamReader( new File( path ) );
         MavenDom4jReader modelReader = new MavenDom4jReader();
 
         Model model = modelReader.read( reader );
diff --git a/modello-plugins/modello-plugin-jackson/src/test/verifiers/jackson/JacksonVerifier.java b/modello-plugins/modello-plugin-jackson/src/test/verifiers/jackson/JacksonVerifier.java
index 280bb8bf6..c135aa215 100644
--- a/modello-plugins/modello-plugin-jackson/src/test/verifiers/jackson/JacksonVerifier.java
+++ b/modello-plugins/modello-plugin-jackson/src/test/verifiers/jackson/JacksonVerifier.java
@@ -42,7 +42,6 @@
 import org.codehaus.modello.verifier.VerifierException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java
index 9056452e8..2e346eaf7 100644
--- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java
+++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -1465,12 +1466,11 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation,
                 }
             }
 
-            if (StringUtils.equals(
-                    javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.FIELD_INIT)) {
+            if (Objects.equals(javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.FIELD_INIT)) {
                 jField.setInitString(defaultValue);
             }
 
-            if (StringUtils.equals(
+            if (Objects.equals(
                     javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.CONSTRUCTOR_INIT)) {
                 jConstructorSource.add("this." + jField.getName() + " = " + defaultValue + ";");
             }
@@ -1484,7 +1484,7 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation,
 
                 JSourceCode sc = getter.getSourceCode();
 
-                if (StringUtils.equals(
+                if (Objects.equals(
                         javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.LAZY_INIT)) {
                     sc.add("if ( this." + jField.getName() + " == null )");
 
diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCompUnit.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCompUnit.java
index e7d2939ef..e6b936f27 100644
--- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCompUnit.java
+++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCompUnit.java
@@ -75,14 +75,13 @@
  */
 
 import java.io.File;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.codehaus.plexus.util.WriterFactory;
-
 /**
  * A representation of the Java Source code for a Java compilation
  * unit. This is
@@ -337,7 +336,7 @@ public void print(String destDir, String lineSeparator) {
         File file = new File(filename);
         JSourceWriter jsw = null;
         try {
-            jsw = new JSourceWriter(WriterFactory.newPlatformWriter(file));
+            jsw = new JSourceWriter(Files.newBufferedWriter(file.toPath()));
         } catch (java.io.IOException ioe) {
             System.out.println("unable to create compilation unit file: " + filename);
             return;
diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMethodSignature.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMethodSignature.java
index 5248e0550..499f60610 100644
--- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMethodSignature.java
+++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMethodSignature.java
@@ -125,7 +125,7 @@ public final class JMethodSignature {
      **/
     public JMethodSignature(String name, JType returnType) {
 
-        if ((name == null) || (name.length() == 0)) {
+        if ((name == null) || (name.isEmpty())) {
             String err = "The method name must not be null or zero-length";
             throw new IllegalArgumentException(err);
         }
diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JStructure.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JStructure.java
index 6401158c4..2f27f57a6 100644
--- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JStructure.java
+++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JStructure.java
@@ -67,13 +67,12 @@
  */
 
 import java.io.File;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
-import org.codehaus.plexus.util.WriterFactory;
-
 /**
  * This class represents the basic Java "structure" for a Java
  * source file. This is the base class for JClass and JInterface.
@@ -555,7 +554,7 @@ public void print(String destDir, String lineSeparator) {
         File file = new File(filename);
         JSourceWriter jsw = null;
         try {
-            jsw = new JSourceWriter(WriterFactory.newPlatformWriter(file));
+            jsw = new JSourceWriter(Files.newBufferedWriter(file.toPath()));
         } catch (java.io.IOException ioe) {
             System.out.println("unable to create class file: " + filename);
             return;
diff --git a/modello-plugins/modello-plugin-sax/src/test/verifiers/sax/SaxVerifier.java b/modello-plugins/modello-plugin-sax/src/test/verifiers/sax/SaxVerifier.java
index bcc94c15a..faf508ba3 100644
--- a/modello-plugins/modello-plugin-sax/src/test/verifiers/sax/SaxVerifier.java
+++ b/modello-plugins/modello-plugin-sax/src/test/verifiers/sax/SaxVerifier.java
@@ -38,7 +38,7 @@
 import org.codehaus.modello.verifier.VerifierException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.xmlunit.builder.DiffBuilder;
diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java
index 62820506e..70784fcb2 100644
--- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java
+++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java
@@ -388,7 +388,7 @@ private void generateStaxReaderDelegate(List<String> versions) throws ModelloExc
         jClass.addImport("javax.xml.stream.*");
 
         jClass.addImport("org.codehaus.plexus.util.IOUtil");
-        jClass.addImport("org.codehaus.plexus.util.ReaderFactory");
+        jClass.addImport("org.codehaus.plexus.util.xml.XmlStreamReader");
 
         JMethod method = new JMethod("read", new JClass("Object"), null);
 
@@ -404,7 +404,7 @@ private void generateStaxReaderDelegate(List<String> versions) throws ModelloExc
         JSourceCode sc = method.getSourceCode();
 
         sc.add("String modelVersion;");
-        sc.add("Reader reader = ReaderFactory.newXmlReader( f );");
+        sc.add("Reader reader = new XmlStreamReader( f );");
 
         sc.add("try");
         sc.add("{");
@@ -415,7 +415,7 @@ private void generateStaxReaderDelegate(List<String> versions) throws ModelloExc
         sc.addIndented("IOUtil.close( reader );");
         sc.add("}");
 
-        sc.add("reader = ReaderFactory.newXmlReader( f );");
+        sc.add("reader = new XmlStreamReader( f );");
         sc.add("try");
         sc.add("{");
         sc.indent();
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-parts/StaxVerifierParts.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-parts/StaxVerifierParts.java
index bbd75e866..aa48fd1ef 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-parts/StaxVerifierParts.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-parts/StaxVerifierParts.java
@@ -32,7 +32,7 @@
 import org.codehaus.modello.test.model.parts.io.stax.PartsStaxWriter;
 import org.codehaus.modello.verifier.Verifier;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,7 +50,7 @@ public void verify()
     {
         File file = new File( "src/test/verifiers/stax-parts/parts.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         PartsStaxReader modelReader = new PartsStaxReader();
 
         Model model = modelReader.read( reader );
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-field/StaxVerifierVersionInField.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-field/StaxVerifierVersionInField.java
index 736a9e558..8a006689b 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-field/StaxVerifierVersionInField.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-field/StaxVerifierVersionInField.java
@@ -26,7 +26,7 @@
 import org.codehaus.modello.test.model.vif.Model;
 import org.codehaus.modello.test.model.vif.io.stax.VersionInFieldStaxReader;
 import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,12 +46,12 @@ public void verify()
     {
         File file = new File( "src/test/verifiers/stax-version-in-field/version-in-field.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         VersionInFieldStaxReader modelReader = new VersionInFieldStaxReader();
 
         Assert.assertEquals( "4.0.0", modelReader.determineVersion( reader ) );
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
         Model model = modelReader.read( reader );
 
         Assert.assertEquals( "4.0.0", model.getModelVersion() );
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-namespace/StaxVerifierVersionInNamespace.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-namespace/StaxVerifierVersionInNamespace.java
index 1a0e72693..7de09e6e4 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-namespace/StaxVerifierVersionInNamespace.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-version-in-namespace/StaxVerifierVersionInNamespace.java
@@ -26,7 +26,7 @@
 import org.codehaus.modello.test.model.vin.Model;
 import org.codehaus.modello.test.model.vin.io.stax.VersionInNamespaceStaxReader;
 import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,12 +43,12 @@ public void verify()
     {
         File file = new File( "src/test/verifiers/stax-version-in-namespace/version-in-namespace.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         VersionInNamespaceStaxReader modelReader = new VersionInNamespaceStaxReader();
 
         Assert.assertEquals( "4.0.0", modelReader.determineVersion( reader ) );
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
         Model model = modelReader.read( reader );
 
         Assert.assertEquals( "Maven", model.getName() );
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version-in-namespace/StaxVerifierWrongVersionNamespace.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version-in-namespace/StaxVerifierWrongVersionNamespace.java
index f2bd1dd6e..ca9ad1a74 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version-in-namespace/StaxVerifierWrongVersionNamespace.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version-in-namespace/StaxVerifierWrongVersionNamespace.java
@@ -26,7 +26,7 @@
 import org.codehaus.modello.test.model.vin.Model;
 import org.codehaus.modello.test.model.vin.io.stax.VersionInNamespaceStaxReader;
 import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,12 +43,12 @@ public void verify()
     {
         File file = new File( "src/test/verifiers/stax-wrong-version-in-namespace/wrong-version-in-namespace.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         VersionInNamespaceStaxReader modelReader = new VersionInNamespaceStaxReader();
 
         Assert.assertEquals( "3.2.1", modelReader.determineVersion( reader ) );
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
         try
         {
             modelReader.read( reader );
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version/StaxVerifierWrongVersion.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version/StaxVerifierWrongVersion.java
index 0eb633354..f73235665 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version/StaxVerifierWrongVersion.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax-wrong-version/StaxVerifierWrongVersion.java
@@ -26,7 +26,7 @@
 import org.codehaus.modello.test.model.vif.Model;
 import org.codehaus.modello.test.model.vif.io.stax.VersionInFieldStaxReader;
 import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,12 +43,12 @@ public void verify()
     {
         File file = new File( "src/test/verifiers/stax-wrong-version/wrong-version.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         VersionInFieldStaxReader modelReader = new VersionInFieldStaxReader();
 
         Assert.assertEquals( "1.2.3", modelReader.determineVersion( reader ) );
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
         try
         {
             modelReader.read( reader );
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
index a483efc6a..3587c3166 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
@@ -35,7 +35,7 @@
 import org.codehaus.modello.test.model.io.stax.MavenStaxWriter;
 import org.codehaus.modello.verifier.Verifier;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
@@ -79,7 +79,7 @@ public void verifyEncodedRead()
     {
         File file = new File( "src/test/verifiers/stax/expected-encoding.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         MavenStaxReader modelReader = new MavenStaxReader();
 
         Model model = modelReader.read( reader );
@@ -92,7 +92,7 @@ public void verifyReadDefaultAttribute()
     {
         File file = new File( "src/test/verifiers/stax/expected-default-extend.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         MavenStaxReader modelReader = new MavenStaxReader();
 
         Model model = modelReader.read( reader );
diff --git a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
index 9aaea02b2..99f639ee6 100644
--- a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
+++ b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
@@ -54,9 +54,11 @@ public class VelocityGenerator extends AbstractModelloGenerator {
     public static final String MODELLO_VELOCITY_OUTPUT = "#MODELLO-VELOCITY#SAVE-OUTPUT-TO ";
 
     @Override
+    @SuppressWarnings("unchecked")
     public void generate(Model model, Properties parameters) throws ModelloException {
         try {
-            Map<String, String> params = (Map) Objects.requireNonNull(parameters.get(VELOCITY_PARAMETERS));
+            Map<String, String> params =
+                    (Map<String, String>) Objects.requireNonNull(parameters.get(VELOCITY_PARAMETERS));
             String templates = getParameter(parameters, VELOCITY_TEMPLATES);
             String output = getParameter(parameters, ModelloParameterConstants.OUTPUT_DIRECTORY);
 
diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java
index 6acc1ddf1..467094ac6 100644
--- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java
+++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java
@@ -56,9 +56,9 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlStreamWriter;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
@@ -115,7 +115,7 @@ private void generateXdoc(Properties parameters) throws IOException {
             f = new File(directory, xdocFileName);
         }
 
-        Writer writer = WriterFactory.newXmlWriter(f);
+        Writer writer = new XmlStreamWriter(f);
 
         XMLWriter w = new PrettyPrintXMLWriter(writer);
 
diff --git a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
index 2a0bc8dc5..278e1921c 100644
--- a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
@@ -30,7 +30,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import junit.framework.Assert;
 import org.codehaus.modello.AbstractModelloGeneratorTest;
 import org.codehaus.modello.core.ModelloCore;
 import org.codehaus.modello.model.Model;
@@ -40,6 +39,7 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.verifier.VerifierException;
 import org.codehaus.plexus.util.FileUtils;
+import org.junit.Assert;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
 import org.xmlunit.diff.Diff;
diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
index 2e9a3a5d1..01f829407 100644
--- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
+++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
@@ -224,7 +224,7 @@ private void writeClassReaders(ModelClass modelClass, JClass jClass, boolean roo
         // ----------------------------------------------------------------------
 
         unmarshall = new JMethod(readerMethodName, new JClass(className), null);
-        unmarshall.setComment("@see ReaderFactory#newXmlReader");
+        unmarshall.setComment("@see XmlStreamReader");
 
         unmarshall.addParameter(new JParameter(new JClass("Reader"), "reader"));
         unmarshall.addParameter(new JParameter(JClass.BOOLEAN, "strict"));
@@ -254,7 +254,7 @@ private void writeClassReaders(ModelClass modelClass, JClass jClass, boolean roo
 
         if (locationTracker == null) {
             unmarshall = new JMethod(readerMethodName, new JClass(className), null);
-            unmarshall.setComment("@see ReaderFactory#newXmlReader");
+            unmarshall.setComment("@see XmlStreamReader");
 
             unmarshall.addParameter(new JParameter(new JClass("Reader"), "reader"));
 
@@ -282,7 +282,7 @@ private void writeClassReaders(ModelClass modelClass, JClass jClass, boolean roo
 
         sc = unmarshall.getSourceCode();
 
-        sc.add("return " + readerMethodName + "( ReaderFactory.newXmlReader( in ), strict" + trackingArgs + " );");
+        sc.add("return " + readerMethodName + "( new XmlStreamReader( in ), strict" + trackingArgs + " );");
 
         jClass.addMethod(unmarshall);
 
@@ -298,7 +298,7 @@ private void writeClassReaders(ModelClass modelClass, JClass jClass, boolean roo
 
             sc = unmarshall.getSourceCode();
 
-            sc.add("return " + readerMethodName + "( ReaderFactory.newXmlReader( in ) );");
+            sc.add("return " + readerMethodName + "( new XmlStreamReader( in ) );");
 
             jClass.addMethod(unmarshall);
         }
@@ -318,7 +318,7 @@ private void generateXpp3Reader() throws ModelloException, IOException {
         initHeader(jClass);
         suppressAllWarnings(objectModel, jClass);
 
-        jClass.addImport("org.codehaus.plexus.util.ReaderFactory");
+        jClass.addImport("org.codehaus.plexus.util.xml.XmlStreamReader");
         jClass.addImport("org.codehaus.plexus.util.xml.pull.MXParser");
         jClass.addImport("org.codehaus.plexus.util.xml.pull.EntityReplacementMap");
         jClass.addImport("org.codehaus.plexus.util.xml.pull.XmlPullParser");
diff --git a/modello-plugins/modello-plugin-xpp3/src/test/verifiers/testStandaloneRead/Xpp3StandaloneReadVerifier.java b/modello-plugins/modello-plugin-xpp3/src/test/verifiers/testStandaloneRead/Xpp3StandaloneReadVerifier.java
index 50121f577..5c0d082ec 100644
--- a/modello-plugins/modello-plugin-xpp3/src/test/verifiers/testStandaloneRead/Xpp3StandaloneReadVerifier.java
+++ b/modello-plugins/modello-plugin-xpp3/src/test/verifiers/testStandaloneRead/Xpp3StandaloneReadVerifier.java
@@ -39,7 +39,7 @@
 import org.codehaus.modello.generator.xml.xpp3.test.standaloneread.io.xpp3.StandaloneReadXpp3Reader;
 
 import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 public class Xpp3StandaloneReadVerifier
@@ -64,11 +64,11 @@ public void verify()
         rootClass = reader.read( in, true );
         assertNotNull( "Expected not null RootClass", rootClass );
 
-        Reader fr = ReaderFactory.newXmlReader( file );
+        Reader fr = new XmlStreamReader( file );
         rootClass = reader.read( fr );
         assertNotNull( "Expected not null RootClass", rootClass );
 
-        fr = ReaderFactory.newXmlReader( file );
+        fr = new XmlStreamReader( file );
         rootClass = reader.read( fr, true );
         assertNotNull( "Expected not null RootClass", rootClass );
 
@@ -86,11 +86,11 @@ public void verify()
         standaloneReadClass = reader.readStandaloneReadClass( in, true );
         assertNotNull( "Expected not null StandaloneReadClass", standaloneReadClass );
 
-        fr = ReaderFactory.newXmlReader( file );
+        fr = new XmlStreamReader( file );
         standaloneReadClass = reader.readStandaloneReadClass( fr );
         assertNotNull( "Expected not null StandaloneReadClass", standaloneReadClass );
 
-        fr = ReaderFactory.newXmlReader( file );
+        fr = new XmlStreamReader( file );
         standaloneReadClass = reader.readStandaloneReadClass( fr, true );
         assertNotNull( "Expected not null StandaloneReadClass", standaloneReadClass );
 
diff --git a/modello-plugins/modello-plugin-xpp3/src/test/verifiers/xpp3/Xpp3Verifier.java b/modello-plugins/modello-plugin-xpp3/src/test/verifiers/xpp3/Xpp3Verifier.java
index 06f52da9b..11d14233f 100644
--- a/modello-plugins/modello-plugin-xpp3/src/test/verifiers/xpp3/Xpp3Verifier.java
+++ b/modello-plugins/modello-plugin-xpp3/src/test/verifiers/xpp3/Xpp3Verifier.java
@@ -39,7 +39,7 @@
 import org.codehaus.modello.verifier.VerifierException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.xmlunit.builder.DiffBuilder;
@@ -99,7 +99,7 @@ public void verifyEncodedRead()
     {
         File file = new File( "src/test/verifiers/xpp3/expected-encoding.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
         Model model = modelReader.read( reader );
@@ -112,7 +112,7 @@ public void verifyThrowingExceptionWithWrongRootElement()
     {
         File file = new File( "src/test/verifiers/xpp3/model-with-wrong-root-element.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
 
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
@@ -126,7 +126,7 @@ public void verifyThrowingExceptionWithWrongRootElement()
             Assert.assertTrue( e.getMessage().startsWith( "Expected root element 'mavenModel' but found" ) );
         }
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
 
         // no failure if it is wrong but strict is off
         modelReader.read( reader, false );
@@ -137,7 +137,7 @@ public void verifyThrowingExceptionWithMissingRootElement()
     {
         File file = new File( "src/test/verifiers/xpp3/model-with-missing-root-element.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
 
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
@@ -151,7 +151,7 @@ public void verifyThrowingExceptionWithMissingRootElement()
             Assert.assertTrue( e.getMessage().startsWith( "Expected root element 'mavenModel' but found" ) );
         }
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
 
         // no failure if it is wrong but strict is off
         modelReader.read( reader, false );
@@ -162,7 +162,7 @@ public void verifyThrowingExceptionWithWrongElement()
     {
         File file = new File( "src/test/verifiers/xpp3/model-with-wrong-element.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
 
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
@@ -176,7 +176,7 @@ public void verifyThrowingExceptionWithWrongElement()
             Assert.assertTrue( e.getMessage().startsWith( "Unrecognised tag: 'bar'" ) );
         }
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
 
         // no failure if it is wrong but strict is off
         Model model = modelReader.read( reader, false );
@@ -192,7 +192,7 @@ public void verifyThrowingExceptionWithWrongElement2()
     {
         File file = new File( "src/test/verifiers/xpp3/model-with-wrong-element2.xml" );
 
-        Reader reader = ReaderFactory.newXmlReader( file );
+        Reader reader = new XmlStreamReader( file );
 
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
@@ -206,7 +206,7 @@ public void verifyThrowingExceptionWithWrongElement2()
             Assert.assertTrue( e.getMessage().startsWith( "Unrecognised tag: 'bar'" ) );
         }
 
-        reader = ReaderFactory.newXmlReader( file );
+        reader = new XmlStreamReader( file );
 
         // no failure if it is wrong but strict is off
         Model model = modelReader.read( reader, false );
diff --git a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java
index 0129787e0..1daa7ccc3 100644
--- a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java
+++ b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java
@@ -44,9 +44,9 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlStreamWriter;
 
 /**
  * @author <a href="mailto:brett@codehaus.org">Brett Porter</a>
@@ -95,7 +95,7 @@ private void generateXsd(Properties parameters) throws IOException, ModelloExcep
             f = new File(directory, xsdFileName);
         }
 
-        Writer writer = WriterFactory.newXmlWriter(f);
+        Writer writer = new XmlStreamWriter(f);
 
         try {
             XMLWriter w = new PrettyPrintXMLWriter(writer);
diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
index 9df849bf4..98d90e8cb 100644
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
@@ -36,7 +36,7 @@
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.xml.sax.SAXException;
 
 /**
@@ -93,7 +93,7 @@ protected Properties getModelloParameters(String version, Integer javaSource) {
     }
 
     protected Reader getXmlResourceReader(String name) throws IOException {
-        return ReaderFactory.newXmlReader(getClass().getResourceAsStream(name));
+        return new XmlStreamReader(getClass().getResourceAsStream(name));
     }
 
     protected SAXParser createSaxParserWithSchema(String generatedXsdName)
diff --git a/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java b/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java
index a6a9225c0..061c84fcd 100644
--- a/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java
+++ b/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java
@@ -27,7 +27,7 @@
 import java.io.Reader;
 import java.lang.reflect.Method;
 
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -49,7 +49,7 @@ protected String getTestPath(String name) {
     }
 
     protected Reader getXmlResourceReader(String name) throws IOException {
-        return ReaderFactory.newXmlReader(getClass().getResourceAsStream(name));
+        return new XmlStreamReader(getClass().getResourceAsStream(name));
     }
 
     protected void assertReader(Class<?> reader, Class<?> model, Class<?> input, Class<?> exception) {
diff --git a/pom.xml b/pom.xml
index 9ea797344..ab3fd80d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
             <proc>none</proc>
+            <showDeprecation>true</showDeprecation>
           </configuration>
         </plugin>
         <plugin>