Upgrade Maven version and resolver version (#3325)

* Upgrade Maven version and resolver version

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>

Author: olamy

maven-failsafe-plugin/pom.xml

@@ -34,7 +34,7 @@
   <description>Maven Failsafe MOJO in maven-failsafe-plugin.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${mavenVersion.prerequisite}</maven>
   </prerequisites>
 
   <properties>

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java

@@ -19,6 +19,7 @@
 package org.apache.maven.plugin.surefire;
 
 import javax.annotation.Nonnull;
+import javax.inject.Inject;
 
 import java.io.File;
 import java.io.IOException;
@@ -77,7 +78,6 @@
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.plugin.surefire.util.DependencyScanner;
 import org.apache.maven.plugin.surefire.util.DirectoryScanner;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
@@ -882,13 +882,13 @@ public abstract class AbstractSurefireMojo extends AbstractMojo implements Suref
     @Parameter
     private Map<String, String> jdkToolchain;
 
-    @Component
+    @Inject
     private ToolchainManager toolchainManager;
 
-    @Component
+    @Inject
     private LocationManager locationManager;
 
-    @Component
+    @Inject
     private ProviderDetector providerDetector;
 
     private Toolchain toolchain;
@@ -953,7 +953,7 @@ private String getDefaultExcludes() {
         return "**/*$*";
     }
 
-    @Component(role = SurefireDependencyResolver.class)
+    @Inject
     private SurefireDependencyResolver surefireDependencyResolver;
 
     private TestListResolver specificTests;

maven-surefire-plugin/pom.xml

@@ -34,7 +34,7 @@
   <description>Maven Surefire MOJO in maven-surefire-plugin.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${mavenVersion.prerequisite}</maven>
   </prerequisites>
 
   <properties>

maven-surefire-plugin/src/site/markdown/architecture.md

@@ -30,8 +30,8 @@ Apache Maven Surefire is the test execution framework for Maven. It ships three
 | **maven-failsafe-plugin** | Runs integration tests during `integration-test` / `verify` phases |
 | **maven-surefire-report-plugin** | Generates HTML test reports from XML results |
 
-Surefire supports JUnit 3, JUnit 4, JUnit 5 (Jupiter), TestNG, and plain POJO tests. <br>
-Until 3.5.x, each type was executed via a dedicated provider module. From 3.6.0 on, there is only one unified provider. <br>
+Surefire supports JUnit 3, JUnit 4, JUnit 5 (Jupiter), TestNG, and plain POJO tests. <br/>
+Until 3.5.x, each type was executed via a dedicated provider module. From 3.6.0 on, there is only one unified provider. <br/>
 Tests execute in a **forked JVM** that communicates results back to Maven through a binary event stream protocol.
 
 ---

maven-surefire-report-plugin/pom.xml

@@ -42,7 +42,7 @@
   </developers>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${mavenVersion.prerequisite}</maven>
   </prerequisites>
 
   <properties>
@@ -160,11 +160,6 @@
       <artifactId>maven-plugin-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-core</artifactId>

pom.xml

@@ -93,8 +93,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.6.3</mavenVersion>
-    <resolverVersion>1.4.1</resolverVersion>
+    <mavenVersion>3.9.14</mavenVersion>
+    <mavenVersion.prerequisite>3.6.3</mavenVersion.prerequisite>
+    <resolverVersion>1.9.27</resolverVersion>
     <commonsLang3Version>3.20.0</commonsLang3Version>
     <commonsCompress>1.28.0</commonsCompress>
     <commonsIoVersion>2.21.0</commonsIoVersion>
@@ -174,11 +175,6 @@
         <artifactId>maven-model</artifactId>
         <version>${mavenVersion}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-compat</artifactId>
-        <version>${mavenVersion}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>