From 25a00cd9d04ff3ab7acdcebdefdbb19ec5c4560d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 23 Jun 2023 21:56:25 +0200
Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 607c914..ba7eed7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
   </parent>
 
   <artifactId>plexus-xml</artifactId>
-  <version>4.0.1</version>
+  <version>4.0.2-SNAPSHOT</version>
 
   <name>Plexus XML Utilities</name>
   <description>A collection of various utility classes to ease working with XML.</description>
@@ -33,7 +33,7 @@ limitations under the License.
   <scm>
     <connection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</connection>
     <developerConnection>${project.scm.connection}</developerConnection>
-    <tag>plexus-xml-4.0.1</tag>
+    <tag>master</tag>
     <url>https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/</url>
   </scm>
   <issueManagement>
@@ -48,7 +48,7 @@ limitations under the License.
   </distributionManagement>
 
   <properties>
-    <project.build.outputTimestamp>2023-06-23T19:56:18Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-06-23T19:56:25Z</project.build.outputTimestamp>
     <javaVersion>8</javaVersion>
   </properties>
 

From a83cefa086c9a5bb8b6674a409016f378b19891e Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Fri, 30 Jun 2023 23:57:00 +0200
Subject: [PATCH 2/4] Cleanup after parent pom upgrade

---
 pom.xml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba7eed7..8d97cb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@ limitations under the License.
 
   <properties>
     <project.build.outputTimestamp>2023-06-23T19:56:25Z</project.build.outputTimestamp>
-    <javaVersion>8</javaVersion>
   </properties>
 
   <dependencies>
@@ -73,7 +72,6 @@ limitations under the License.
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.9.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -85,15 +83,6 @@ limitations under the License.
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -119,16 +108,6 @@ limitations under the License.
         <configuration>
           <!-- required to ensure the test classes are used, not surefire's plexus-utils -->
           <childDelegation>true</childDelegation>
-          <systemPropertyVariables>
-            <property>
-              <name>JAVA_HOME</name>
-              <value>${JAVA_HOME}</value>
-            </property>
-            <property>
-              <name>M2_HOME</name>
-              <value>${M2_HOME}</value>
-            </property>
-          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>

From c3d99b433a272d8eb1cc7c799410799e8c16ace3 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 3 Jul 2023 10:34:18 +0200
Subject: [PATCH 3/4] Upgrade to 4.0.0-alpha-7 and exclude dependency to sisu
 (fixes #17) (#23)

---
 pom.xml                                            | 14 +++++++++++++-
 .../org/codehaus/plexus/util/xml/Xpp3DomUtils.java |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d97cb4..14236bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,13 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-xml-impl</artifactId>
-      <version>4.0.0-alpha-5</version>
+      <version>4.0.0-alpha-7</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
@@ -80,6 +86,12 @@ limitations under the License.
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>4.0.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
index b4475f6..d8a47e5 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
@@ -125,7 +125,7 @@ public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) {
     }
 
     /**
-     * @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isNotEmpty(String)} instead
+     * @deprecated Use org.codehaus.plexus.util.StringUtils#isNotEmpty(String) instead
      */
     @Deprecated
     public static boolean isNotEmpty(String str) {
@@ -133,7 +133,7 @@ public static boolean isNotEmpty(String str) {
     }
 
     /**
-     * @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isEmpty(String)} instead
+     * @deprecated Use org.codehaus.plexus.util.StringUtils#isEmpty(String) instead
      */
     @Deprecated
     public static boolean isEmpty(String str) {

From 944197c74386b199857a003160d840fb5593ac29 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 4 Jul 2023 10:14:18 +0200
Subject: [PATCH 4/4] [maven-release-plugin] prepare release plexus-xml-4.0.2

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 14236bb..35d72bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
   </parent>
 
   <artifactId>plexus-xml</artifactId>
-  <version>4.0.2-SNAPSHOT</version>
+  <version>4.0.2</version>
 
   <name>Plexus XML Utilities</name>
   <description>A collection of various utility classes to ease working with XML.</description>
@@ -33,7 +33,7 @@ limitations under the License.
   <scm>
     <connection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</connection>
     <developerConnection>${project.scm.connection}</developerConnection>
-    <tag>master</tag>
+    <tag>plexus-xml-4.0.2</tag>
     <url>https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/</url>
   </scm>
   <issueManagement>
@@ -48,7 +48,7 @@ limitations under the License.
   </distributionManagement>
 
   <properties>
-    <project.build.outputTimestamp>2023-06-23T19:56:25Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-07-04T08:14:13Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>