[maven-surefire] branch master updated: [jenkins] JDK: 7, 8, 17

[tibordigana]

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

tibordigana 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 fd8afdf  [jenkins] JDK: 7, 8, 17
fd8afdf is described below

commit fd8afdf12f0571034f3ab3c92ed39b60de4f21d4
Author: tibordigana <tibor.dig...@gmail.com>
AuthorDate: Sun Nov 14 20:59:14 2021 +0100

    [jenkins] JDK: 7, 8, 17
---
 Jenkinsfile                                                           | 4 ++--
 .../org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e6b60e4..1a4c07c 100644
--- 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
index 8bd3801..69b010a 100644
--- 
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 org.junit.runner.RunWith;
 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 class CheckTestNgListenerReporterIT
         {
             // 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 )