From 52448fcbcd2f4c5252ced2340c25c3d86da96c92 Mon Sep 17 00:00:00 2001 From: Abel Salgado Romero Date: Sun, 31 Dec 2023 19:36:21 +0100 Subject: [PATCH] Bump dependencies and fix Xpp3DoomBuilder Xpp3Doom no longer supports 'getParent()' https://github.com/codehaus-plexus/plexus-xml/commit/0bcfeb7a783eee7931094ee2d70f8ca086aa11dc --- asciidoctor-maven-commons/pom.xml | 14 +++++++++++++- .../asciidoctor/maven/site/Xpp3DoomBuilder.java | 5 ++++- asciidoctor-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/asciidoctor-maven-commons/pom.xml b/asciidoctor-maven-commons/pom.xml index 9fe9a8ee..611be004 100644 --- a/asciidoctor-maven-commons/pom.xml +++ b/asciidoctor-maven-commons/pom.xml @@ -38,10 +38,22 @@ ${maven.project.version} provided + + org.apache.maven + maven-api-xml + 4.0.0-alpha-10 + provided + + + org.apache.maven + maven-xml-impl + 4.0.0-alpha-10 + provided + org.codehaus.plexus plexus-utils - ${plexus.utils.version} + 4.0.0 compile 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 index bdf78d15..af53e066 100644 --- 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 index aad1e644..2ca6490d 100644 --- a/asciidoctor-maven-plugin/pom.xml +++ b/asciidoctor-maven-plugin/pom.xml @@ -51,7 +51,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - ${maven.plugin.plugin.version} + 3.10.2 provided diff --git a/pom.xml b/pom.xml index 656396d3..b8b96b80 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ UTF-8 11 - 3.9.1 + 4.0.0-alpha-10 2.5.11 9.4.5.0