commit 95dc80a98f4fba46bad57edeba963beb7991f00f
author Martin Stockhammer <m.stockhammer@web.de> Fri Oct 23 16:47:38 2020 +0200
committer Martin Stockhammer <m.stockhammer@web.de> Fri Oct 23 16:47:38 2020 +0200
tree ea18e5cffe7c3ed3f26a5a868e9916cd1f375a53
parent d422fdfe03252564c93ab6b5ee7c4e59871c32a7

Trying to fix JDK labels

vars/asfStandardBuild.groovy

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 @@
   ])
 
   // 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'

vars/multiJdkBuild.groovy

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 @@
   ])
 
   // 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"