[SUREFIRE-2173] Pass build and tests with Java 20

.github/workflows/maven-verify.yml

@@ -26,8 +26,8 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
     with:
-      jdk-matrix: '[ "8", "11", "17", "19" ]'
-      ff-jdk: '19'
+      jdk-matrix: '[ "8", "11", "17", "20" ]'
+      ff-jdk: '20'
       ff-goal: 'clean install site site:stage -P reporting -nsu'
       ff-site-goal: '-v'
       verify-goal: 'clean install -nsu -P run-its'

Jenkinsfile

@@ -33,7 +33,7 @@ properties(
 final def oses = ['linux':'ubuntu && maven']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.8.x', '3.2.x'] : ['3.8.x']
 // all non-EOL versions and the first EA
-final def jdks = [19, 17, 11, 8]
+final def jdks = [20, 17, 11, 8]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install']

maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml

@@ -131,8 +131,8 @@
     <integration-test-port>8083</integration-test-port>
     <integration-test-stop-port>18009</integration-test-stop-port>
     <jetty-version>9.2.2.v20140723</jetty-version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
 </project>

maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml

@@ -131,8 +131,8 @@
     <integration-test-port>8083</integration-test-port>
     <integration-test-stop-port>18009</integration-test-stop-port>
     <jetty-version>9.2.2.v20140723</jetty-version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
 </project>

maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml

@@ -27,8 +27,8 @@
   <name>Run tests multiple times</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

maven-failsafe-plugin/src/it/multiple-summaries/pom.xml

@@ -27,8 +27,8 @@
   <name>Run tests multiple times</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

maven-failsafe-plugin/src/it/working-directory/pom.xml

@@ -27,8 +27,8 @@
   <name>Run tests in a nonexistent working directory</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/environment-variables/pom.xml

@@ -32,8 +32,8 @@
       <forkCount>1</forkCount>
       <reuseForks>false</reuseForks>
       <useSystemClassLoader>false</useSystemClassLoader>
-      <maven.compiler.source>1.7</maven.compiler.source>
-      <maven.compiler.target>1.7</maven.compiler.target>
+      <maven.compiler.source>1.8</maven.compiler.source>
+      <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
   <dependencies>
     <dependency>

surefire-its/src/test/resources/failingBuilds/pom.xml

@@ -34,7 +34,7 @@
   <properties>
     <junit.version>4.8.1</junit.version>
     <forkCount>1</forkCount>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 </project>

surefire-its/src/test/resources/failsafe-notests/pom.xml

@@ -28,8 +28,8 @@
   <name>failsafe-notests</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/failure-result-counting/pom.xml

@@ -34,7 +34,7 @@
     <junit.version>4.10</junit.version>
     <forkCount>1</forkCount>
     <reuseForks>true</reuseForks>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 </project>

surefire-its/src/test/resources/failureOutput/pom.xml

@@ -45,8 +45,8 @@
       <printSummary>true</printSummary>
       <useFile>true</useFile>
       <reportFormat>brief</reportFormat>
-      <maven.compiler.source>1.7</maven.compiler.source>
-      <maven.compiler.target>1.7</maven.compiler.target>
+      <maven.compiler.source>1.8</maven.compiler.source>
+      <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
 </project>

surefire-its/src/test/resources/fork-consoleOutput/pom.xml

@@ -42,8 +42,8 @@
       <reuseForks>true</reuseForks>
       <printSummary>true</printSummary>
       <reportFormat>brief</reportFormat>
-      <maven.compiler.source>1.7</maven.compiler.source>
-      <maven.compiler.target>1.7</maven.compiler.target>
+      <maven.compiler.source>1.8</maven.compiler.source>
+      <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
 </project>

surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml

@@ -45,8 +45,8 @@
       <printSummary>true</printSummary>
       <useFile>true</useFile>
       <reportFormat>brief</reportFormat>
-      <maven.compiler.source>1.7</maven.compiler.source>
-      <maven.compiler.target>1.7</maven.compiler.target>
+      <maven.compiler.source>1.8</maven.compiler.source>
+      <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
 </project>

surefire-its/src/test/resources/fork-count-multimodule/pom.xml

@@ -31,8 +31,8 @@
   <packaging>pom</packaging>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <modules>

surefire-its/src/test/resources/fork-count-resource-loading/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for forkCount</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/fork-count-testng/pom.xml

@@ -13,8 +13,8 @@
   <name>Test for forkCount</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/fork-count/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for forkCount</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/fork-fail/pom.xml

@@ -30,8 +30,8 @@
 
   <properties>
     <argLine>-Xmxxxx712743m</argLine>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/fork-timeout/pom.xml

@@ -13,8 +13,8 @@
     <forkCount>1</forkCount>
     <reuseForks>true</reuseForks>
     <timeOut>1</timeOut>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
   <dependencies>
       <dependency>

surefire-its/src/test/resources/includes-excludes-from-file/pom.xml

@@ -31,8 +31,8 @@ under the License.
 
   <properties>
     <junit.version>3.8.2</junit.version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/includes-excludes/pom.xml

@@ -31,8 +31,8 @@ under the License.
 
   <properties>
     <junit.version>3.8.2</junit.version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/isolated-classloader/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for useSystemClassLoader=false</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/junit-ignore/pom.xml

@@ -32,8 +32,8 @@
     <junit.version>4.4</junit.version>
     <surefire.parallel></surefire.parallel>
     <surefire.threadcount>3</surefire.threadcount>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit-innerClass/pom.xml

@@ -29,8 +29,8 @@
   <name>Test JUnit classes with inner classes</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for JUnit tests that don't extend TestCase</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml

@@ -29,8 +29,8 @@
   <name>Test path with Ümlaut</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <skipCompiler>false</skipCompiler>
   </properties>
 

surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for single suite with two test cases</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <build>

surefire-its/src/test/resources/junit-twoTestCases/pom.xml

@@ -24,8 +24,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml

@@ -11,8 +11,8 @@
   </description>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for rerun failing tests in JUnit 4</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit4-runlistener/pom.xml

@@ -31,8 +31,8 @@
   <properties>
     <junitVersion>4.4</junitVersion>
     <provider>surefire-junit4</provider>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml

@@ -31,8 +31,8 @@
 
   <properties>
     <junitVersion>4.4</junitVersion>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit4/pom.xml

@@ -29,8 +29,8 @@
 
     <properties>
         <junitVersion>4.13.2</junitVersion>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>

surefire-its/src/test/resources/junit44-dep/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for junit-dep</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>

surefire-its/src/test/resources/junit44-environment/pom.xml

@@ -29,8 +29,8 @@
   <name>Test for setting environment variables</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>