commit aad25d048d06b8c0eebc1e2e22d0d4d88966d058
author rfscholte <rfscholte@apache.org> Thu Apr 22 23:21:28 2021 +0200
committer rfscholte <rfscholte@apache.org> Thu Apr 22 23:22:11 2021 +0200
tree 94dd49f097bf9a1579ee8c10f0241f088d436724
parent 1045d73ec7f628e6c5fafce19fb4a90211b8af58

Drop Java 7, add Java 17

vars/asfMavenTlpPlgnBuild.groovy

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 894b55c..2a48432 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -36,7 +36,7 @@
     // now determine the matrix of parallel builds
     def oses = params.containsKey('os') ? params.os : ['linux', 'windows']
 	// minimum, LTS, current and next ea
-    def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['7','8','11','16']
+    def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','16','17']
     def jdkMin = jdks[0];
     def mavens = params.containsKey('maven') ? params.maven : ['3.2.x','3.3.x','3.5.x','3.6.x']
     // def failFast = params.containsKey('failFast') ? params.failFast : true
@@ -128,10 +128,6 @@
 //  } else { // Requires authorization on SonarQube first
 //    cmd += 'sonar:sonar'
   }
-  if (jdk == '7') {
-    // Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
-    cmd += '-Dhttps.protocols=TLSv1.2'
-  }
 
   if (plan == 'build') {
       cmd += 'clean'

vars/asfMavenTlpStdBuild.groovy

diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index e8dd547..5262774 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -36,7 +36,7 @@
     // now determine the matrix of parallel builds
     def oses = params.containsKey('os') ? params.os : ['linux', 'windows']
     // minimum, LTS, current and next ea
-    def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['7','8','11','16']
+    def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','16','17']
     def maven = params.containsKey('maven') ? params.maven : '3.x.x'
     def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
     // def failFast = params.containsKey('failFast') ? params.failFast : true
@@ -63,10 +63,6 @@
         if (!first) {
           cmd += '-Dfindbugs.skip=true'
         }
-        if (jdk == '7') {
-          // Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
-          cmd += '-Dhttps.protocols=TLSv1.2'
-        }
         cmd += 'clean'
         if (env.BRANCH_NAME == 'master' && jdk == '8' && os == 'linux' ) {
           cmd += 'deploy'