You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/29 15:53:52 UTC
[maven] branch MNG-7655 created (now c12c15fc2)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7655
in repository https://gitbox.apache.org/repos/asf/maven.git
at c12c15fc2 [MNG-7655] maven-plexus-utils and maven-plexus-utils-xml (xml-impl)
This branch includes the following new commits:
new c12c15fc2 [MNG-7655] maven-plexus-utils and maven-plexus-utils-xml (xml-impl)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: [MNG-7655] maven-plexus-utils and maven-plexus-utils-xml (xml-impl)
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7655
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c12c15fc21877f40f95cc3fb0c81bce8cb96fd33
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Dec 29 16:53:49 2022 +0100
[MNG-7655] maven-plexus-utils and maven-plexus-utils-xml (xml-impl)
---
api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java | 3 ++-
maven-artifact/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 4 ++--
maven-model-transform/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
{maven-xml-impl => maven-plexus-utils-xml}/README.md | 0
{maven-xml-impl => maven-plexus-utils-xml}/pom.xml | 5 +++--
.../src/main/java/org/apache/maven/internal/xml/DomBuilder.java | 0
.../main/java/org/apache/maven/internal/xml/MavenXmlException.java | 0
.../java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java | 0
.../src/main/java/org/apache/maven/internal/xml/Xpp3Dom.java | 0
.../src/main/java/org/apache/maven/internal/xml/Xpp3DomBuilder.java | 0
.../src/main/java/org/apache/maven/internal/xml/Xpp3DomWriter.java | 0
.../src/main/java/org/apache/maven/internal/xml/package-info.java | 0
.../src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 0
.../src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java | 0
.../src/main/java/org/codehaus/plexus/util/xml/package-info.java | 0
.../src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java | 0
{plexus-utils => maven-plexus-utils}/README.md | 0
{plexus-utils => maven-plexus-utils}/pom.xml | 4 ++--
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 4 ++--
maven-toolchain-builder/pom.xml | 2 +-
maven-toolchain-model/pom.xml | 4 ++--
pom.xml | 6 +++---
31 files changed, 27 insertions(+), 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
index 7a3822415..8a990e3f5 100644
--- 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.Nullable;
import org.apache.maven.api.annotations.ThreadSafe;
/**
- * An immutable xml node.
+ * An immutable Xpp3Dom 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
index 6ee331f26..7fbcfe4c6 100644
--- 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
index c983778c9..bf3862a6f 100644
--- 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
index e2dd97ca3..9490f8ea8 100644
--- 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
index a6aaee43e..1b21bfc64 100644
--- 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
index 1a3850c3d..421d3f75d 100644
--- 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
index 95fa9ea94..9cefadd22 100644
--- 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
index 7b7bf1379..985f8153f 100644
--- 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 b/maven-plexus-utils-xml/README.md
similarity index 100%
rename from maven-xml-impl/README.md
rename to maven-plexus-utils-xml/README.md
diff --git a/maven-xml-impl/pom.xml b/maven-plexus-utils-xml/pom.xml
similarity index 89%
rename from maven-xml-impl/pom.xml
rename to maven-plexus-utils-xml/pom.xml
index db8b7a523..bd47794f1 100644
--- a/maven-xml-impl/pom.xml
+++ b/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 immutalbe XML API</description>
<dependencies>
<dependency>
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/DomBuilder.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/DomBuilder.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/DomBuilder.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/DomBuilder.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3Dom.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3Dom.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3Dom.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3Dom.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3DomBuilder.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3DomBuilder.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3DomBuilder.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3DomBuilder.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3DomWriter.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3DomWriter.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/Xpp3DomWriter.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/Xpp3DomWriter.java
diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/package-info.java b/maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/package-info.java
rename to maven-plexus-utils-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
diff --git a/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java b/maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
rename to maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
diff --git a/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java b/maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
rename to maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
diff --git a/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/package-info.java b/maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/package-info.java
similarity index 100%
rename from maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/package-info.java
rename to maven-plexus-utils-xml/src/main/java/org/codehaus/plexus/util/xml/package-info.java
diff --git a/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java b/maven-plexus-utils-xml/src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java
similarity index 100%
rename from maven-xml-impl/src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java
rename to maven-plexus-utils-xml/src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java
diff --git a/plexus-utils/README.md b/maven-plexus-utils/README.md
similarity index 100%
rename from plexus-utils/README.md
rename to maven-plexus-utils/README.md
diff --git a/plexus-utils/pom.xml b/maven-plexus-utils/pom.xml
similarity index 98%
rename from plexus-utils/pom.xml
rename to maven-plexus-utils/pom.xml
index 6193526da..22a1183e8 100644
--- a/plexus-utils/pom.xml
+++ b/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
index 3735068b8..c1f70463b 100644
--- 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
index 8ebec9710..49d860aab 100644
--- 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
index 5b5499ee7..f709b73c2 100644
--- 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
index 0b774540b..8f2069d58 100644
--- 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
index 8b77d69b7..1f9893dca 100644
--- 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
index cbb5b9a89..7b8b1fd59 100644
--- 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
index 9a72225a1..1d0cfd491 100644
--- 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
index 7a4ecbd65..aa1397ab5 100644
--- 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>