Bump dependencies and fix Xpp3DoomBuilder

Xpp3Doom no longer supports 'getParent()' codehaus-plexus/plexus-xml@0bcfeb7
asciidoctor · Dec 31, 2023 · 52448fc · 52448fc
1 parent e27c64b
commit 52448fc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/asciidoctor-maven-commons/pom.xml b/asciidoctor-maven-commons/pom.xml
@@ -38,10 +38,22 @@
             <version>${maven.project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-api-xml</artifactId>
+            <version>4.0.0-alpha-10</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-xml-impl</artifactId>
+            <version>4.0.0-alpha-10</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>${plexus.utils.version}</version>
+            <version>4.0.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/asciidoctor-maven-commons/src/test/java/org/asciidoctor/maven/site/Xpp3DoomBuilder.java b/asciidoctor-maven-commons/src/test/java/org/asciidoctor/maven/site/Xpp3DoomBuilder.java
@@ -6,6 +6,7 @@ public class Xpp3DoomBuilder {
 
     private Xpp3Dom rootNode;
     private Xpp3Dom currentNode;
+    private Xpp3Dom parentNode;
 
     private Xpp3DoomBuilder(String name) {
         rootNode = currentNode = new Xpp3Dom(name);
@@ -26,6 +27,7 @@ public static Xpp3DoomBuilder logHandler() {
     public Xpp3DoomBuilder addChild(String name) {
         final Xpp3Dom newNode = new Xpp3Dom(name);
         currentNode.addChild(newNode);
+        parentNode = currentNode;
         currentNode = newNode;
         return this;
     }
@@ -42,12 +44,13 @@ public Xpp3DoomBuilder addChild(String name, String... values) {
                 currentNode.addChild(newNode);
             }
         }
+        parentNode = currentNode;
         currentNode = newNode;
         return this;
     }
 
     public Xpp3DoomBuilder parent() {
-        currentNode = currentNode.getParent();
+        currentNode = parentNode;
         return this;
     }
 

diff --git a/asciidoctor-maven-plugin/pom.xml b/asciidoctor-maven-plugin/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>${maven.plugin.plugin.version}</version>
+            <version>3.10.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.java.version>11</project.java.version>
-        <maven.project.version>3.9.1</maven.project.version>
+        <maven.project.version>4.0.0-alpha-10</maven.project.version>
         <asciidoctorj.version>2.5.11</asciidoctorj.version>
         <jruby.version>9.4.5.0</jruby.version>
     </properties>