From: Martin Stockhammer <martin_s@apache.org>
Date: Fri, 23 Oct 2020 15:06:07 +0000 (+0200)
Subject: Fixing JDK and maven labels for build
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=06671e010e49b38119a9b6cb0f0f7c89572d5433;p=archiva.git

Fixing JDK and maven labels for build
---

diff --git a/Jenkinsfile b/Jenkinsfile
index ecd3e0e8d..4a4a34748 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,11 +28,11 @@
  * Only the war and zip artifacts are archived in the jenkins build archive.
  */
 LABEL = 'ubuntu && !H23'
-buildJdk = 'JDK 1.8 (latest)'
-buildJdk9 = 'JDK 1.9 (latest)'
-buildJdk10 = 'JDK 10 (latest)'
-buildJdk11 = 'JDK 11 (latest)'
-buildMvn = 'Maven 3.5.4'
+buildJdk = 'jdk_1.8_latest'
+buildJdk9 = 'jdk_1.9_latest'
+buildJdk10 = 'jdk_10_latest'
+buildJdk11 = 'jdk_11_latest'
+buildMvn = 'maven_3.5.4'
 //localRepository = ".repository"
 //localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
 mavenOpts = '-Xms1g -Xmx2g -Djava.awt.headless=true'
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index a2d854d21..3edd96e27 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -25,8 +25,8 @@
  */
 
 LABEL = 'ubuntu'
-buildJdk = 'JDK 1.8 (latest)'
-buildMvn = 'Maven 3.5.4'
+buildJdk = 'jdk_1.8_latest'
+buildMvn = 'maven_3.5.4'
 deploySettings = 'archiva-uid-jenkins'
 DOCKERHUB_CREDS = 'c725478f-9125-460a-900f-1da562e51026'
 //localRepository = ".repository"