You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/05/19 10:33:50 UTC
(maven) 08/10: Merge PR #12082: Switch mvnup to domtrip on 4.0.x
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-4.0.x-test-fixes
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d6b6935a919ed7924a9018e7aeead42b767cf935
Merge: 2dabbdc550 2a1cf481ae
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue May 19 12:33:28 2026 +0200
Merge PR #12082: Switch mvnup to domtrip on 4.0.x
.../main/appended-resources/META-INF/LICENSE.vm | 3 +-
impl/maven-cli/pom.xml | 9 +-
.../maven/cling/invoker/mvnup/UpgradeContext.java | 2 +-
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 45 +-
.../mvnup/goals/AbstractUpgradeStrategy.java | 94 ++-
.../mvnup/goals/CompatibilityFixStrategy.java | 488 ++++++--------
.../maven/cling/invoker/mvnup/goals/DomUtils.java | 211 ++++++
.../maven/cling/invoker/mvnup/goals/GAV.java | 49 --
.../maven/cling/invoker/mvnup/goals/GAVUtils.java | 132 ----
.../invoker/mvnup/goals/InferenceStrategy.java | 389 +++++------
.../maven/cling/invoker/mvnup/goals/JDomUtils.java | 544 ----------------
.../invoker/mvnup/goals/ModelUpgradeStrategy.java | 209 +++---
.../invoker/mvnup/goals/ModelVersionUtils.java | 85 ++-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 181 +++--
.../cling/invoker/mvnup/goals/PomDiscovery.java | 273 ++------
.../invoker/mvnup/goals/StrategyOrchestrator.java | 193 +++---
.../invoker/mvnup/goals/UpgradeConstants.java | 236 -------
.../cling/invoker/mvnup/goals/UpgradeStrategy.java | 12 +-
.../cling/invoker/mvnup/goals/package-info.java | 2 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 5 +-
.../mvnup/goals/CompatibilityFixStrategyTest.java | 60 +-
.../cling/invoker/mvnup/goals/DomUtilsTest.java | 725 +++++++++++++++++++++
.../maven/cling/invoker/mvnup/goals/GAVTest.java | 149 -----
.../cling/invoker/mvnup/goals/GAVUtilsTest.java | 102 ++-
.../invoker/mvnup/goals/InferenceStrategyTest.java | 257 ++++----
.../cling/invoker/mvnup/goals/JDomUtilsTest.java | 453 -------------
.../mvnup/goals/ModelUpgradeStrategyTest.java | 312 ++++-----
.../invoker/mvnup/goals/ModelVersionUtilsTest.java | 80 ++-
.../mvnup/goals/PluginUpgradeStrategyTest.java | 206 ++----
.../cling/invoker/mvnup/goals/PomBuilder.java | 10 +-
.../mvnup/goals/StrategyOrchestratorTest.java | 2 +-
.../maven/cling/invoker/mvnup/goals/TestUtils.java | 11 +
pom.xml | 17 +-
src/graph/ReactorGraph.java | 2 +-
34 files changed, 2359 insertions(+), 3189 deletions(-)
diff --cc impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java
index 21a9f16c1b,c6c7289426..0dcb39883c
--- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java
+++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java
@@@ -53,27 -55,25 +56,24 @@@ import org.apache.maven.cling.invoker.m
import org.apache.maven.impl.standalone.ApiRunner;
import org.codehaus.plexus.components.secdispatcher.Dispatcher;
import org.codehaus.plexus.components.secdispatcher.internal.dispatchers.LegacyDispatcher;
-import org.eclipse.aether.internal.impl.DefaultPathProcessor;
-import org.eclipse.aether.internal.impl.DefaultTransporterProvider;
-import org.eclipse.aether.internal.impl.transport.http.DefaultChecksumExtractor;
-import org.eclipse.aether.spi.connector.transport.TransporterProvider;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.spi.connector.transport.http.ChecksumExtractor;
+import org.eclipse.aether.spi.io.PathProcessor;
import org.eclipse.aether.transport.file.FileTransporterFactory;
import org.eclipse.aether.transport.jdk.JdkTransporterFactory;
- import org.jdom2.Document;
- import org.jdom2.Element;
- import org.jdom2.Namespace;
- import org.jdom2.output.XMLOutputter;
-
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.Plugins.DEFAULT_MAVEN_PLUGIN_GROUP_ID;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.Plugins.MAVEN_4_COMPATIBILITY_REASON;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.Plugins.MAVEN_PLUGIN_PREFIX;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.ARTIFACT_ID;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.BUILD;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.GROUP_ID;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.PARENT;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.PLUGIN;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.PLUGINS;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.PLUGIN_MANAGEMENT;
- import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.VERSION;
+
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.ARTIFACT_ID;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.BUILD;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.GROUP_ID;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PARENT;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PLUGIN;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PLUGINS;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PLUGIN_MANAGEMENT;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PROPERTIES;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.VERSION;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Plugins.DEFAULT_MAVEN_PLUGIN_GROUP_ID;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Plugins.MAVEN_4_COMPATIBILITY_REASON;
+ import static eu.maveniverse.domtrip.maven.MavenPomElements.Plugins.MAVEN_PLUGIN_PREFIX;
/**
* Strategy for upgrading Maven plugins to recommended versions.
diff --cc pom.xml
index 456083d34c,75098d09da..4a947e8dce
--- a/pom.xml
+++ b/pom.xml
@@@ -144,11 -144,12 +144,12 @@@ under the License
<!-- various versions -->
<assertjVersion>3.27.7</assertjVersion>
<asmVersion>9.9.1</asmVersion>
- <byteBuddyVersion>1.18.7</byteBuddyVersion>
+ <byteBuddyVersion>1.18.8</byteBuddyVersion>
<classWorldsVersion>2.9.0</classWorldsVersion>
<commonsCliVersion>1.11.0</commonsCliVersion>
+ <domtripVersion>0.4.1</domtripVersion>
<guiceVersion>5.1.0</guiceVersion>
- <guavaVersion>33.5.0-jre</guavaVersion>
+ <guavaVersion>33.6.0-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<hamcrestVersion>3.0</hamcrestVersion>
<jakartaInjectApiVersion>2.0.1</jakartaInjectApiVersion>