Move off p-u

Author: cstamas

pom.xml

@@ -44,17 +44,6 @@
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-xml</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>4.0.2</version>
-    </dependency>
-
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
@@ -97,8 +86,8 @@
             <goals>
               <goal>java</goal>
               <goal>xsd</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
+              <goal>stax-reader</goal>
+              <goal>stax-writer</goal>
             </goals>
           </execution>
         </executions>

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/SecUtil.java

@@ -26,7 +26,7 @@
 import org.codehaus.plexus.components.secdispatcher.model.Config;
 import org.codehaus.plexus.components.secdispatcher.model.ConfigProperty;
 import org.codehaus.plexus.components.secdispatcher.model.SettingsSecurity;
-import org.codehaus.plexus.components.secdispatcher.model.io.xpp3.SecurityConfigurationXpp3Reader;
+import org.codehaus.plexus.components.secdispatcher.model.io.stax.SecurityConfigurationStaxReader;
 
 /**
  *
@@ -49,7 +49,7 @@ public static SettingsSecurity read(String location, boolean cycle) throws SecDi
 
         try {
             try (InputStream in = toStream(location)) {
-                sec = new SecurityConfigurationXpp3Reader().read(in);
+                sec = new SecurityConfigurationStaxReader().read(in);
             }
 
             if (cycle && sec.getRelocation() != null) return read(sec.getRelocation(), true);

src/test/java/org/codehaus/plexus/components/secdispatcher/internal/SecUtilTest.java

@@ -27,7 +27,7 @@
 import org.codehaus.plexus.components.secdispatcher.model.Config;
 import org.codehaus.plexus.components.secdispatcher.model.ConfigProperty;
 import org.codehaus.plexus.components.secdispatcher.model.SettingsSecurity;
-import org.codehaus.plexus.components.secdispatcher.model.io.xpp3.SecurityConfigurationXpp3Writer;
+import org.codehaus.plexus.components.secdispatcher.model.io.stax.SecurityConfigurationStaxWriter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -69,7 +69,10 @@ private void saveSec(String masterSource) throws Exception {
 
         sec.addConfiguration(conf);
 
-        new SecurityConfigurationXpp3Writer().write(new FileWriter("./target/sec1.xml"), sec);
+        try (FileWriter fw = new FileWriter("./target/sec1.xml")) {
+            new SecurityConfigurationStaxWriter().write(fw, sec);
+            fw.flush();
+        }
     }
 
     @BeforeEach
@@ -79,7 +82,10 @@ public void prepare() throws Exception {
         SettingsSecurity sec = new SettingsSecurity();
 
         sec.setRelocation("./target/sec1.xml");
-        new SecurityConfigurationXpp3Writer().write(new FileWriter("./target/sec.xml"), sec);
+        try (FileWriter fw = new FileWriter("./target/sec.xml")) {
+            new SecurityConfigurationStaxWriter().write(fw, sec);
+            fw.flush();
+        }
 
         saveSec("magic:mighty");
     }