From 24f8dd6fbc4179bd692d9e6b8e0b7c4138876ef3 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Mon, 20 Dec 2021 18:02:43 +0100
Subject: [PATCH] [SUREFIRE-1959] Update plugin (requires Maven 3.2.5+)

---
 .../plugin/surefire/SurefireDependencyResolverTest.java  | 4 ----
 pom.xml                                                  | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
index ebf0e1b7a8..d476dfa331 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
@@ -133,8 +133,6 @@ public ArtifactResolutionResult answer( InvocationOnMock invocation )
                         .isNull();
                     assertThat( request.getLocalRepository() )
                         .isNull();
-                    assertThat( request.getCache() )
-                        .isNull();
                     assertThat( request.getCollectionFilter() )
                         .isNotNull();
                     assertThat( request.getCollectionFilter() )
@@ -204,8 +202,6 @@ public ArtifactResolutionResult answer( InvocationOnMock invocation )
                         .isNull();
                     assertThat( request.getLocalRepository() )
                         .isNull();
-                    assertThat( request.getCache() )
-                        .isNull();
                     assertThat( request.getCollectionFilter() )
                         .isNotNull();
                     assertThat( request.getCollectionFilter() )
diff --git a/pom.xml b/pom.xml
index 0aa6f44c65..4692e25917 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
 
   <properties>
     <javaVersion>7</javaVersion>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
     <!-- <shadedVersion>3.0.0-M2</shadedVersion> commented out due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
     <commonsLang3Version>3.8.1</commonsLang3Version>
     <commonsCompress>1.20</commonsCompress>
@@ -129,7 +129,7 @@
       <dependency>
         <groupId>org.apache.maven.reporting</groupId>
         <artifactId>maven-reporting-api</artifactId>
-        <version>${mavenVersion}</version>
+        <version>3.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -243,7 +243,7 @@
       <dependency>
         <groupId>org.apache.maven.plugin-testing</groupId>
         <artifactId>maven-plugin-testing-harness</artifactId>
-        <version>2.1</version>
+        <version>3.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.xmlunit</groupId>
@@ -462,6 +462,9 @@
               <arg>-Xdoclint:all</arg>
             </compilerArgs>
             <encoding>UTF-8</encoding>
+            <!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8186647 -->
+            <!-- org.eclipse.sisu.inject provide annotation processor -->
+            <proc>none</proc>
           </configuration>
         </plugin>
         <!-- NOTE: animal sniffer does not check test classes: https://jira.codehaus.org/browse/MANIMALSNIFFER-40 -->