[maven-jenkins-lib] branch master updated: Add JDK 18

[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 0b627d9  Add JDK 18
0b627d9 is described below

commit 0b627d952111ececc2e14e24a16660ea6a2b0a41
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Wed Sep 29 19:54:47 2021 +0200

    Add JDK 18
---
 vars/asfMavenTlpPlgnBuild.groovy | 2 +-
 vars/asfMavenTlpStdBuild.groovy  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index cfd060a..701d0b3 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 : ['8','11','17']
+    def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['8','11','17','18']
     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
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index a189dbd..2da4337 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 : ['8','11','17']
+    def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['8','11','17','18']
     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