[maven-jenkins-lib] branch master updated: Drop Java 7, add Java 17

[rfscholte]

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

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new aad25d0  Drop Java 7, add Java 17
aad25d0 is described below

commit aad25d048d06b8c0eebc1e2e22d0d4d88966d058
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Thu Apr 22 23:21:28 2021 +0200

    Drop Java 7, add Java 17
---
 vars/asfMavenTlpPlgnBuild.groovy | 6 +-----
 vars/asfMavenTlpStdBuild.groovy  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

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 @@ def call(Map params = [:]) {
     // 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 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, 
taskContext )
 //  } 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'
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 @@ def call(Map params = [:]) {
     // 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 @@ def call(Map params = [:]) {
         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'