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 12:57:01 UTC
(maven) branch polydactyl-tango created (now 00b2408daa)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch polydactyl-tango
in repository https://gitbox.apache.org/repos/asf/maven.git
at 00b2408daa Merge branch 'maven-4.0.x' into polydactyl-tango
This branch includes the following new commits:
new 00b2408daa Merge branch 'maven-4.0.x' into polydactyl-tango
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven) 01/01: Merge branch 'maven-4.0.x' into polydactyl-tango
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch polydactyl-tango
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 00b2408daae3a55f2862474df09baed785854e8f
Merge: 2a1cf481ae 6b42a8e69b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue May 19 14:56:50 2026 +0200
Merge branch 'maven-4.0.x' into polydactyl-tango
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
.github/workflows/maven.yml | 34 +++---
apache-maven/pom.xml | 5 +-
.../java/org/apache/maven/api/JavaToolchain.java | 2 +
api/maven-api-model/src/main/mdo/maven.mdo | 3 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 7 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 11 ++
.../maven/toolchain/java/JavaToolchainImpl.java | 12 +++
.../conflict/AbstractConflictResolverTest.java | 5 -
.../toolchain/java/JavaToolchainFactoryTest.java | 94 +++++++++++++++++
.../src/examples/simple-project/pom.xml | 12 +--
.../java/org/apache/maven/embedder/AppTest.java | 36 ++-----
.../maven/cli/props/MavenPropertiesTest.java | 4 -
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 38 ++++---
.../maven/cling/utils/CLIReportingUtils.java | 3 +
.../impl/ConsumerPomArtifactTransformer.java | 2 +-
.../impl/DefaultConsumerPomBuilder.java | 26 ++++-
.../maven/project/DefaultProjectBuilder.java | 38 +------
.../maven/project/SourceHandlingContext.java | 116 ++++++++++++---------
.../org/apache/maven/project/SourceQueries.java | 84 +++++++++++++++
.../impl/ConsumerPomBuilderTest.java | 86 +++++++++++----
.../org/apache/maven/lifecycle/test/AppTest.java | 36 ++-----
.../plexus-utils/1.0.4/plexus-utils-1.0.4.pom | 2 +-
.../test/resources/consumer/multi-module/pom.xml | 41 ++++++++
.../org/apache/maven/di/impl/InjectorImpl.java | 7 +-
impl/maven-executor/pom.xml | 2 +-
.../{api/cli => cling/executor}/Executor.java | 2 +-
.../cli => cling/executor}/ExecutorException.java | 2 +-
.../maven/cling/executor/ExecutorHelper.java | 3 -
.../cli => cling/executor}/ExecutorRequest.java | 2 +-
.../apache/maven/cling/executor/ExecutorTool.java | 2 -
.../executor/embedded/EmbeddedMavenExecutor.java | 23 +++-
.../cling/executor/forked/ForkedMavenExecutor.java | 8 +-
.../maven/cling/executor/internal/HelperImpl.java | 6 +-
.../maven/cling/executor/internal/ToolboxTool.java | 4 +-
.../cling/executor/MavenExecutorTestSupport.java | 2 -
.../embedded/EmbeddedMavenExecutorTest.java | 2 +-
.../executor/forked/ForkedMavenExecutorTest.java | 2 +-
.../maven/cling/executor/impl/ToolboxToolTest.java | 4 +-
.../maven/impl/DefaultJavaToolchainFactory.java | 20 +++-
.../maven/impl/model/DefaultModelBuilder.java | 4 +-
.../maven/impl/model/DefaultModelValidator.java | 70 +++++++------
.../impl/DefaultJavaToolchainFactoryTest.java | 97 +++++++++++++++++
.../maven/impl/model/DefaultModelBuilderTest.java | 6 +-
.../impl/model/DefaultModelValidatorTest.java | 6 ++
.../profile-with-property-in-repository-url.xml | 68 ++++++++++++
.../it/MavenITmng2690MojoLoadingErrorsTest.java | 4 +-
...mng5640LifecycleParticipantAfterSessionEnd.java | 2 +-
.../src/test/resources/it0030/pom.xml | 2 +-
.../dependencyManagement/child/grandchild1/pom.xml | 18 ----
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../dependencyManagement/child/grandchild2/pom.xml | 11 --
.../main/java/org/apache/maven/mng624/World.java | 25 -----
.../mng-0624/dependencyManagement/child/pom.xml | 25 -----
.../mng-0624/dependencyManagement/pom.xml | 23 ----
.../test/resources/mng-0624/noParentInTree/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/optionalVersion/child1/pom.xml | 14 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../optionalVersion/child2/grandchild/pom.xml | 14 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/optionalVersion/child2/pom.xml | 16 ---
.../optionalVersion/child3/child3child/pom.xml | 14 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/optionalVersion/child3/pom.xml | 16 ---
.../mng-0624/optionalVersion/child4/pom.xml | 14 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/optionalVersion/grandchild2/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../resources/mng-0624/optionalVersion/pom.xml | 14 ---
.../resources/mng-0624/parentBadPath/main/pom.xml | 14 ---
.../main/src/main/java/mng0624/Hello.java | 25 -----
.../main/src/test/java/mng0624/HelloTest.java | 28 -----
.../mng-0624/parentBadPath/parent/pom.xml | 22 ----
.../test/resources/mng-0624/parentBadPath/pom.xml | 14 ---
.../test/resources/mng-0624/simple/child/pom.xml | 37 -------
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../src/test/resources/mng-0624/simple/pom.xml | 13 ---
.../mng-0624/versionInProperty/child1/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../versionInProperty/child2/grandchild/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/versionInProperty/child2/pom.xml | 17 ---
.../versionInProperty/child3/child3child/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/versionInProperty/child3/pom.xml | 17 ---
.../mng-0624/versionInProperty/child4/pom.xml | 15 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../mng-0624/versionInProperty/grandchild2/pom.xml | 16 ---
.../java/org/apache/maven/mng624/HelloWorld.java | 25 -----
.../resources/mng-0624/versionInProperty/pom.xml | 18 ----
.../test/java/com/stchome/mavenTest/AppTest.java | 32 +-----
.../src/test/resources/mng-2289/issue/pom.xml | 23 ----
.../issue/src/main/java/mng/Issue2289.java | 28 -----
.../src/test/resources/mng-2289/parent/pom1.xml | 52 ---------
.../src/test/resources/mng-2289/parent/pom2.xml | 53 ----------
.../src/test/resources/mng-2289/test.sh | 25 -----
.../test/resources/mng-3038/test-project/A/pom.xml | 6 +-
.../org/apache/maven/its/it0121/A/AppTest.java | 10 +-
.../mng-3372/direct-using-prefix/project/pom.xml | 6 +-
.../project/src/test/java/org/test/AppTest.java | 24 +----
.../src/test/resources/mng-3485/pom.xml | 6 +-
.../java/org/apache/maven/its/mng3485/AppTest.java | 24 +----
.../mng-3498/maven-mng3498-plugin/pom.xml | 2 +-
.../src/test/resources/mng-3506/mng-3506.1/pom.xml | 6 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 25 +----
.../src/test/resources/mng-3506/mng-3506.2/pom.xml | 6 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 24 +----
.../src/test/resources/mng-3671/pom.xml | 6 +-
.../mng-3671/src/test/java/testing/AppTest.java | 24 +----
.../mng-3684/maven-mng3684-plugin/pom.xml | 2 +-
.../mng-3693/maven-mng3693-plugin/pom.xml | 2 +-
.../test/resources/mng-3693/projects/app/pom.xml | 2 +-
.../mng-3694/maven-mng3694-plugin/pom.xml | 2 +-
.../resources/mng-3694/projects/not-used/pom.xml | 6 +-
.../not-used/src/test/java/tests/AppTest.java | 24 +----
.../resources/mng-3694/projects/project/pom.xml | 6 +-
.../project/src/test/java/tests/AppTest.java | 24 +----
.../mng-3703/maven-mng3703-plugin/pom.xml | 2 +-
.../src/test/resources/mng-3703/project/pom.xml | 2 +-
.../maven-mng3710-directInvoke-plugin/pom.xml | 2 +-
.../maven-mng3710-originalModel-plugin/pom.xml | 2 +-
.../maven-mng3710-pomInheritance-plugin/pom.xml | 2 +-
.../mng-3716/maven-mng3716-plugin/pom.xml | 2 +-
.../resources/mng-3716/projects/child1/pom.xml | 2 +-
.../resources/mng-3716/projects/child2/pom.xml | 2 +-
.../mng-3723/maven-mng3723-plugin/pom.xml | 2 +-
.../mng-3724/maven-mng3724-plugin/pom.xml | 2 +-
.../mng-3729/maven-mng3729-plugin/pom.xml | 2 +-
.../mng-3746/maven-mng3746-plugin/pom.xml | 2 +-
.../src/test/resources/mng-4005/dep/pom.xml | 2 +-
.../src/test/resources/mng-4005/man-dep/pom.xml | 4 +-
.../test/resources/mng-4005/profile-dep/pom.xml | 4 +-
.../resources/mng-4005/profile-man-dep/pom.xml | 4 +-
.../src/test/resources/mng-4270/pom.xml | 6 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 24 +----
.../src/test/resources/mng-5338/project/pom.xml | 6 +-
.../java/org/apache/maven/its/mng5338/AppTest.java | 24 +----
.../builderror-mojoex/pom.xml | 6 +-
.../builderror-runtimeex/pom.xml | 6 +-
.../buildfailure-depmissing/pom.xml | 6 +-
.../org/apache/maven/its/mng5640/FailingTest.java | 7 +-
.../buildfailure-utfail/pom.xml | 6 +-
.../org/apache/maven/its/mng5640/FailingTest.java | 7 +-
.../core-it-plugins/maven-it-plugin-error/pom.xml | 6 +-
.../coreit/NoClassDefFoundErrorComponentMojo.java | 6 +-
.../coreit/NoClassDefFoundErrorInterfaceMojo.java | 4 +-
.../RequirementComponentLookupExceptionMojo.java | 4 +-
.../maven-it-plugin-plexus-utils-new/pom.xml | 2 +-
.../main/java/org/apache/maven/it/Verifier.java | 4 +-
its/pom.xml | 6 +-
pom.xml | 18 ++--
src/graph/ReactorGraph.java | 57 +++++-----
152 files changed, 943 insertions(+), 1637 deletions(-)
diff --cc impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java
index c6c7289426,3b0dfa6538..66f3b91d61
--- 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
@@@ -55,25 -53,27 +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 75098d09da,456083d34c..4a947e8dce
--- a/pom.xml
+++ b/pom.xml
@@@ -144,12 -144,11 +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>