[archiva-jenkins-lib] branch master updated: Trying to fix JDK labels

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 95dc80a  Trying to fix JDK labels
95dc80a is described below

commit 95dc80a98f4fba46bad57edeba963beb7991f00f
Author: Martin Stockhammer <m....@web.de>
AuthorDate: Fri Oct 23 16:47:38 2020 +0200

    Trying to fix JDK labels
---
 vars/asfStandardBuild.groovy | 2 +-
 vars/multiJdkBuild.groovy    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy
index e5f0ee0..66f92b5 100644
--- a/vars/asfStandardBuild.groovy
+++ b/vars/asfStandardBuild.groovy
@@ -39,7 +39,7 @@ def call(Map params = [:]) {
   ])
 
   // now determine params
-  def jdk = params.containsKey('jdk') ? params.jdk : 'JDK 1.8 (latest)'
+  def jdk = params.containsKey('jdk') ? params.jdk : 'jdk_1.8_latest'
   // use the cmdLine parameter otherwise default depending on current branch
   def cmdline = params.containsKey('cmdline') ? params.cmdline : ((env.NONAPACHEORG_RUN != 'y' && env.BRANCH_NAME == 'master') ?"clean deploy":"clean install")
   def mvnName = params.containsKey('mvnName') ? params.mvnName : 'Maven 3.5.4'
diff --git a/vars/multiJdkBuild.groovy b/vars/multiJdkBuild.groovy
index 1d21395..5d3bc44 100644
--- a/vars/multiJdkBuild.groovy
+++ b/vars/multiJdkBuild.groovy
@@ -40,8 +40,8 @@ def call(Map params = [:]) {
   ])
 
   // now determine params
-  def jdk = params.containsKey('jdk') ? params.jdk : 'JDK 1.8 (latest)'
-  def jdk11 = params.containsKey('jdk11') ? params.jdk : 'JDK 11 (latest)'
+  def jdk = params.containsKey('jdk') ? params.jdk : 'jdk_1.8_latest'
+  def jdk11 = params.containsKey('jdk11') ? params.jdk : 'jdk_11_latest'
   // use the cmdLine parameter otherwise default depending on current branch
   def cmdline = params.containsKey('cmdline') ? params.cmdline : ((env.NONAPACHEORG_RUN != 'y' && env.BRANCH_NAME == 'master') ?"clean deploy":"clean install")
   def cmdlineJdk11 = params.containsKey('cmdlineJdk11') ? params.cmdlineJdk11 : "clean install"