You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/10/17 16:01:57 UTC

[maven-jenkins-env] branch master updated: Update to new tool names

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

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git


The following commit(s) were added to refs/heads/master by this push:
     new 56931dd  Update to new tool names
56931dd is described below

commit 56931dd9de5a6e1bcd89989a01f6b91b2062281c
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Oct 17 18:01:47 2020 +0200

    Update to new tool names
---
 vars/jenkinsEnv.groovy | 72 +++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index 5cd8841..f7da47c 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -42,48 +42,48 @@ class jenkinsEnv implements Serializable {
             case 'linux':
                 switch (version) {
                     case '7':
-                        return 'JDK 1.7 (latest)'
+                        return 'jdk_1.7_latest'
                     case '8':
-                        return 'JDK 1.8 (latest)'
+                        return 'jdk_1.8_latest'
                     case '9':
-                        return 'JDK 1.9 (latest)'
+                        return 'jdk_1.9_latest'
                     case '10':
-                        return 'JDK 10 (latest)'
+                        return 'jdk_10_latest'
                     case '11':
-                        return 'JDK 11 (latest)'
+                        return 'jdk_11_latest'
                     case '12':
-                        return 'JDK 12 (latest)'
+                        return 'jdk_12_latest'
                     case '13':
-                        return 'JDK 13 (latest)'
+                        return 'jdk_13_latest'
                     case '14':
-                        return 'JDK 14 (latest)'
+                        return 'jdk_14_latest'
                     case '15':
-                        return 'JDK 15 (latest)'
+                        return 'jdk_15_latest'
                     case '16':
-                        return 'JDK 16 (latest)'
+                        return 'jdk_16_latest'
                     default:
                         return null
                 }
             case 'windows':
                 switch(version) {
                     case '7':
-                        return 'JDK 1.7 (latest)'
+                        return 'jdk_1.7_latest'
                     case '8':
-                        return 'JDK 1.8 (latest)'
+                        return 'jdk_1.8_latest'
                     case '9':
-                        return 'JDK 1.9 (latest)'
+                        return 'jdk_1.9_latest'
                     case '10':
-                        return 'JDK 10 (latest)'
+                        return 'jdk_10_latest'
                     case '11':
-                        return 'JDK 11 (latest)'
+                        return 'jdk_11_latest'
                     case '12':
-                        return 'JDK 12 (latest)'
+                        return 'jdk_12_latest'
                     case '13':
-                        return 'JDK 13 (latest)'
+                        return 'jdk_13_latest'
                     case '14':
-                        return 'JDK 14 (latest)'
+                        return 'jdk_14_latest'
                     case '15':
-                        return 'JDK 15 (latest)'
+                        return 'jdk_15_latest'
                     default:
                         return null
                 }
@@ -96,40 +96,40 @@ class jenkinsEnv implements Serializable {
             case 'linux':
                 switch(version) {
                     case ~/^3\.0\.[x5]$/:
-                        return 'Maven 3.0.5'
+                        return 'Maven_3.0.5'
                     case ~/^3\.1\.[x1]$/:
-                        return 'Maven 3.1.1'
+                        return 'Maven_3.1.1'
                     case ~/^3\.2\.[x5]$/:
-                        return 'Maven 3.2.5'
+                        return 'Maven_3.2.5'
                     case ~/^3\.3\.[x9]$/:
-                        return 'Maven 3.3.9'
+                        return 'Maven_3.3.9'
                     case ~/^3\.5\.[x4]$/:
-                        return 'Maven 3.5.4'
+                        return 'Maven_3.5.4'
                     case ~/^3\.6\.[x3]$/:
-                        return 'Maven 3.6.3'
+                        return 'Maven_3.6.3'
                     case '3.x.x':
-                        return 'Maven 3.6.3'
+                        return 'Maven_3.6.3'
                     default:
-                        return 'Maven 3.6.3'
+                        return 'Maven_3.6.3'
                 }
             case 'windows':
                 switch(version) {
                     case ~/^3\.0\.[x5]$/:
-                        return 'Maven 3.0.5 (Windows)'
+                        return 'Maven_3.0.5_Windows'
                     case ~/^3\.1\.[x1]$/:
-                        return 'Maven 3.1.1 (Windows)'
+                        return 'Maven_3.1.1_Windows'
                     case ~/^3\.2\.[x5]$/:
-                        return 'Maven 3.2.5 (Windows)'
+                        return 'Maven_3.2.5_Windows'
                     case ~/^3\.3\.[x9]$/:
-                        return 'Maven 3.3.9 (Windows)'
+                        return 'Maven_3.3.9_Windows'
                     case ~/^3\.5\.[x4]$/:
-                        return 'Maven 3.5.4 (Windows)'
-                    case ~/^3\.6\.[x2]$/:
-                        return 'Maven 3.6.2 (Windows)'
+                        return 'Maven_3.5.4_Windows'
+                    case ~/^3\.6\.[x3]$/:
+                        return 'Maven_3.6.3_Windows'
                     case '3.x.x':
-                        return 'Maven 3.6.2 (Windows)'
+                        return 'Maven_3.6.3_Windows'
                     default:
-                        return 'Maven 3.6.2 (Windows)'
+                        return 'Maven_3.6.3_Windows'
                 }
             default:
                 return null