commit c3ee1a76aebea7ca3057830e3a066bdd3df13818
author Martin Stockhammer <m.stockhammer@web.de> Fri Oct 23 16:59:10 2020 +0200
committer Martin Stockhammer <m.stockhammer@web.de> Fri Oct 23 16:59:10 2020 +0200
tree c3a84dac65619c61c95b49adac5d0887fae08f3a
parent 2fd66594bfc4cf629da95181bec7ff70d3a2ae3b

Trying to fix Maven labels

vars/asfStandardBuild.groovy

diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy
index 66f92b5..d9b4e31 100644
--- a/vars/asfStandardBuild.groovy
+++ b/vars/asfStandardBuild.groovy
@@ -42,7 +42,7 @@
   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'
+  def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.5.4'
 
 
   def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),

vars/multiJdkBuild.groovy

diff --git a/vars/multiJdkBuild.groovy b/vars/multiJdkBuild.groovy
index 51485a3..01ef5df 100644
--- a/vars/multiJdkBuild.groovy
+++ b/vars/multiJdkBuild.groovy
@@ -45,7 +45,7 @@
   // 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"
-  def mvnName = params.containsKey('mvnName') ? params.mvnName : 'apache-maven-3.5.4'
+  def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.5.4'
 
 
   def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),