[MNG-7655] maven-plexus-utils and maven-plexus-utils-xml (xml-impl)

apache · Dec 30, 2022 · 5957d23 · 5957d23
1 parent 6178f6e
commit 5957d23
Show file tree

Hide file tree

Showing 31 changed files with 27 additions and 25 deletions.
diff --git a/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java b/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java
@@ -28,7 +28,8 @@
 import org.apache.maven.api.annotations.ThreadSafe;
 
 /**
- * An immutable xml node.
+ * An immutable XML node, based on Plexus Utils mutable
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a>.
  *
  * @since 4.0
  */

diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
@@ -33,7 +33,7 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
@@ -82,7 +82,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
@@ -130,7 +130,7 @@ under the License.
     <!-- Plexus -->
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
@@ -109,7 +109,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
@@ -34,12 +34,12 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-xml-impl</artifactId>
+      <artifactId>maven-plexus-utils-xml</artifactId>
       <version>4.0.0-alpha-4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-model-transform/pom.xml b/maven-model-transform/pom.xml
@@ -30,7 +30,7 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/maven-model/pom.xml b/maven-model/pom.xml
@@ -39,7 +39,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-xml-impl</artifactId>
+      <artifactId>maven-plexus-utils-xml</artifactId>
       <version>4.0.0-alpha-4-SNAPSHOT</version>
     </dependency>
   </dependencies>

diff --git a/maven-xml-impl/README.md → maven-plexus-utils-xml/README.md b/maven-xml-impl/README.md → maven-plexus-utils-xml/README.md
diff --git a/maven-xml-impl/pom.xml → maven-plexus-utils-xml/pom.xml b/maven-xml-impl/pom.xml → maven-plexus-utils-xml/pom.xml
@@ -25,9 +25,10 @@ under the License.
     <version>4.0.0-alpha-4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>maven-xml-impl</artifactId>
+  <artifactId>maven-plexus-utils-xml</artifactId>
 
-  <name>Maven XML Implementation</name>
+  <name>Maven Plexus Utils XML Implementation</name>
+  <description>Reimplementation of Plexus Utils XML classes using Maven 4 immutable XML API</description>
 
   <dependencies>
     <dependency>

diff --git a/...apache/maven/internal/xml/DomBuilder.java → ...apache/maven/internal/xml/DomBuilder.java b/...apache/maven/internal/xml/DomBuilder.java → ...apache/maven/internal/xml/DomBuilder.java
diff --git a/...maven/internal/xml/MavenXmlException.java → ...maven/internal/xml/MavenXmlException.java b/...maven/internal/xml/MavenXmlException.java → ...maven/internal/xml/MavenXmlException.java
diff --git a/.../internal/xml/XmlPlexusConfiguration.java → .../internal/xml/XmlPlexusConfiguration.java b/.../internal/xml/XmlPlexusConfiguration.java → .../internal/xml/XmlPlexusConfiguration.java
diff --git a/...rg/apache/maven/internal/xml/Xpp3Dom.java → ...rg/apache/maven/internal/xml/Xpp3Dom.java b/...rg/apache/maven/internal/xml/Xpp3Dom.java → ...rg/apache/maven/internal/xml/Xpp3Dom.java
diff --git a/...he/maven/internal/xml/Xpp3DomBuilder.java → ...he/maven/internal/xml/Xpp3DomBuilder.java b/...he/maven/internal/xml/Xpp3DomBuilder.java → ...he/maven/internal/xml/Xpp3DomBuilder.java
diff --git a/...che/maven/internal/xml/Xpp3DomWriter.java → ...che/maven/internal/xml/Xpp3DomWriter.java b/...che/maven/internal/xml/Xpp3DomWriter.java → ...che/maven/internal/xml/Xpp3DomWriter.java
diff --git a/...ache/maven/internal/xml/package-info.java → ...ache/maven/internal/xml/package-info.java b/...ache/maven/internal/xml/package-info.java → ...ache/maven/internal/xml/package-info.java
diff --git a/...org/codehaus/plexus/util/xml/Xpp3Dom.java → ...org/codehaus/plexus/util/xml/Xpp3Dom.java b/...org/codehaus/plexus/util/xml/Xpp3Dom.java → ...org/codehaus/plexus/util/xml/Xpp3Dom.java
diff --git a/...ehaus/plexus/util/xml/Xpp3DomBuilder.java → ...ehaus/plexus/util/xml/Xpp3DomBuilder.java b/...ehaus/plexus/util/xml/Xpp3DomBuilder.java → ...ehaus/plexus/util/xml/Xpp3DomBuilder.java
diff --git a/...odehaus/plexus/util/xml/package-info.java → ...odehaus/plexus/util/xml/package-info.java b/...odehaus/plexus/util/xml/package-info.java → ...odehaus/plexus/util/xml/package-info.java
diff --git a/...pache/maven/internal/xml/Xpp3DomTest.java → ...pache/maven/internal/xml/Xpp3DomTest.java b/...pache/maven/internal/xml/Xpp3DomTest.java → ...pache/maven/internal/xml/Xpp3DomTest.java
diff --git a/plexus-utils/README.md → maven-plexus-utils/README.md b/plexus-utils/README.md → maven-plexus-utils/README.md
diff --git a/plexus-utils/pom.xml → maven-plexus-utils/pom.xml b/plexus-utils/pom.xml → maven-plexus-utils/pom.xml
@@ -26,7 +26,7 @@ under the License.
   </parent>
 
   <groupId>org.apache.maven</groupId>
-  <artifactId>plexus-utils</artifactId>
+  <artifactId>maven-plexus-utils</artifactId>
   <version>4.0.0-alpha-4-SNAPSHOT</version>
 
   <dependencies>
@@ -37,7 +37,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-xml-impl</artifactId>
+      <artifactId>maven-plexus-utils-xml</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
@@ -46,7 +46,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
@@ -34,7 +34,7 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>

diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
@@ -70,7 +70,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
@@ -53,7 +53,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
@@ -39,12 +39,12 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-xml-impl</artifactId>
+      <artifactId>maven-plexus-utils-xml</artifactId>
       <version>4.0.0-alpha-4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/maven-toolchain-builder/pom.xml b/maven-toolchain-builder/pom.xml
@@ -45,7 +45,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
@@ -38,12 +38,12 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-xml-impl</artifactId>
+      <artifactId>maven-plexus-utils-xml</artifactId>
       <version>4.0.0-alpha-4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>plexus-utils</artifactId>
+      <artifactId>maven-plexus-utils</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -107,8 +107,8 @@ under the License.
     <module>maven-model-builder</module>
     <module>maven-model-transform</module>
     <module>api</module>
-    <module>maven-xml-impl</module>
-    <module>plexus-utils</module>
+    <module>maven-plexus-utils-xml</module>
+    <module>maven-plexus-utils</module>
     <module>maven-core</module>
     <module>maven-settings</module>
     <module>maven-settings-builder</module>
@@ -205,7 +205,7 @@ under the License.
       <!--  Plexus -->
       <dependency>
         <groupId>org.apache.maven</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <artifactId>maven-plexus-utils</artifactId>
         <version>${plexusUtilsVersion}</version>
       </dependency>
       <dependency>