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

[martin_s]

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 c3ee1a7  Trying to fix Maven labels
c3ee1a7 is described below

commit c3ee1a76aebea7ca3057830e3a066bdd3df13818
Author: Martin Stockhammer <m.stockham...@web.de>
AuthorDate: Fri Oct 23 16:59:10 2020 +0200

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

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 call(Map params = [:]) {
   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),
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 @@ def call(Map params = [:]) {
   // 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),