This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/master by this push:
     new 230df2696 Fix #3586: pin mavenVersion to 3.9.16 + resolverVersion to 
1.9.27
230df2696 is described below

commit 230df26969325076f727cd4c878a0876b1aaec36
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 11 10:30:07 2026 +0100

    Fix #3586: pin mavenVersion to 3.9.16 + resolverVersion to 1.9.27
    
    The 3.x line built against Maven 3.10.0 (mavenVersion) with Resolver 2.0.24
    (resolverVersion) while maven-surefire-plugin declares a 3.6.3 prerequisite.
    Maven 3.10.0 is the first 3.x release shipping Resolver 2, so a plugin with 
a
    3.6.3 prerequisite compiling against Resolver 2 assumes a runtime only Maven
    3.10+ provides; maven-surefire-common also packages maven-resolver-util at
    compile scope, shadowing Resolver 1 on a Maven 3.9 runtime.
    
    Revert to Maven 3.9.16 + Resolver 1.9.27 (in line with the other Maven 3.x
    plugin lines), raise the prerequisite to 3.9.0, and add Dependabot 
exclusions
    so neither mavenVersion-bound core artifacts (>= 3.10.0) nor
    org.apache.maven.resolver:* (>= 2.0.0) can be bumped, preventing the Maven
    >=3.10 + Resolver >=2.0 combination.
    
    The Resolver 1.9.x line has no maven-resolver-transport-apache artifact
    (that name only exists from Resolver 2.0.0); its HttpClient transport is
    named maven-resolver-transport-http, so maven-surefire-report-plugin's
    test dependency uses that artifactId instead. Same
    org.apache.maven.resolver.transport.http package in both lines.
---
 .github/dependabot.yml               | 24 +++++++++++++++++++++++-
 maven-surefire-report-plugin/pom.xml |  2 +-
 pom.xml                              |  6 +++---
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6dbce72d5..582234961 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -34,7 +34,29 @@ updates:
     - dependency-name: "junit:junit"
     # to remove when depending on core 4.x
     - dependency-name: "org.apache.maven.resolver:*"
-      versions: [ ">=2.0"]
+      versions: [ ">= 2.0.0"]
+    # mavenVersion is pinned to 3.9.16 (the Resolver 1 line, Maven 3.9.16 ships
+    # Resolver 1.9.27). Dependabot must not bump the Maven 3.x core artifacts 
to
+    # 3.10.0+, which ships Resolver 2, because the plugin declares a 3.9.0
+    # prerequisite and maven-surefire-common packages maven-resolver-util at
+    # compile scope. Together with the org.apache.maven.resolver:* >= 2.0.0
+    # exclusion above, this prevents Dependabot from proposing Maven >=3.10 and
+    # Resolver >=2.0 in the same update. See
+    # https://github.com/apache/maven-surefire/issues/3586
+    - dependency-name: "org.apache.maven:maven-core"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-plugin-api"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-model"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-artifact"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-settings"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-embedder"
+      versions: [ ">= 3.10.0"]
+    - dependency-name: "org.apache.maven:maven-resolver-provider"
+      versions: [ ">= 3.10.0"]
     - dependency-name: "org.mockito:*"
       versions: [ ">=5.0"]
     # JUnit 6 requires Java 17; the build still runs on JDK 8
diff --git a/maven-surefire-report-plugin/pom.xml 
b/maven-surefire-report-plugin/pom.xml
index f3ddf2b35..6ed9c9977 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -179,7 +179,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-apache</artifactId>
+      <artifactId>maven-resolver-transport-http</artifactId>
       <version>${resolverVersion}</version>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index ef970b9fe..d77188436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,9 +94,9 @@
     
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
     
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
     
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
-    <mavenVersion>3.10.0</mavenVersion>
-    <mavenVersion.prerequisite>3.6.3</mavenVersion.prerequisite>
-    <resolverVersion>2.0.24</resolverVersion>
+    <mavenVersion>3.9.16</mavenVersion>
+    <mavenVersion.prerequisite>3.9.0</mavenVersion.prerequisite>
+    <resolverVersion>1.9.27</resolverVersion>
     <commonsLang3Version>3.21.0</commonsLang3Version>
     <commonsCompress>1.28.0</commonsCompress>
     <commonsIoVersion>2.22.0</commonsIoVersion>

Reply via email to