[jenkins] JDK: 7, 8, 17

apache · Nov 20, 2021 · fd8afdf · fd8afdf
1 parent e71fec7
commit fd8afdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,10 +30,10 @@ properties(
     ]
 )
 
-final def oses = ['linux':'ubuntu && !H48', 'windows':'Windows']
+final def oses = ['linux':'ubuntu', 'windows':'Windows']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.6.x']
 // all non-EOL versions and the first EA
-final def jdks = [16, 11, 8, 7]
+final def jdks = [17, 8, 7]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install']

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -28,8 +28,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaMaxVersion;
 import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersionExcluded;
 import static org.junit.runners.Parameterized.Parameter;
 import static org.junit.runners.Parameterized.Parameters;
 
@@ -100,7 +100,7 @@ public void testNgListenerReporter()
         {
             // only 5.13 uses Google Guice, reflection which breaks jdk 16+
             // module java.base does not "opens java.lang" to unnamed module @209c0b14
-            assumeJavaVersionExcluded( 16 );
+            assumeJavaMaxVersion( 15 );
         }
 
         final SurefireLauncher launcher = unpack( "testng-listener-reporter", "_" + version )