From ed71bf9a071da18c2d57f986de51112f90db18d5 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 22 May 2024 23:28:21 +0200 Subject: [PATCH] Update to maven 4.0.0-beta-3 --- .../plugin/report/PluginDescriptorBuilder.java | 4 ++-- pom.xml | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginDescriptorBuilder.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginDescriptorBuilder.java index 3422531a..cb118fe3 100644 --- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginDescriptorBuilder.java +++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginDescriptorBuilder.java @@ -29,7 +29,7 @@ import com.ctc.wstx.stax.WstxInputFactory; import org.apache.maven.api.xml.XmlNode; -import org.apache.maven.internal.xml.XmlNodeBuilder; +import org.apache.maven.internal.xml.XmlNodeStaxBuilder; import org.apache.maven.internal.xml.XmlPlexusConfiguration; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; @@ -152,7 +152,7 @@ private ExtendedPluginDescriptor build(String source, String nsUri, XMLStreamRea } protected PlexusConfiguration buildConfiguration(XMLStreamReader xsr) throws XMLStreamException { - XmlNode node = XmlNodeBuilder.build(xsr, true, null); + XmlNode node = XmlNodeStaxBuilder.build(xsr, true, null); PlexusConfiguration cfg = XmlPlexusConfiguration.toPlexusConfiguration(node); return cfg; } diff --git a/pom.xml b/pom.xml index c973324c..d66f4173 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 8 3.3.0 - 4.0.0-alpha-13 + 4.0.0-beta-3 3.2.5 2.0.11 1.10.14 @@ -333,6 +333,21 @@ + + + + true + never + fail + + + false + + maven-2126 + https://repository.apache.org/content/repositories/maven-2126/ + + +