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 2021/09/29 17:53:46 UTC

[maven-jenkins-env] branch master updated: Adding JDK 18

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 db938d0  Adding JDK 18
db938d0 is described below

commit db938d039b1c204bf5228fee41e4503163bd885c
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Sep 29 19:53:33 2021 +0200

    Adding JDK 18
---
 vars/jenkinsEnv.groovy | 86 ++++++++++++++++----------------------------------
 1 file changed, 28 insertions(+), 58 deletions(-)

diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index b0fbd4d..71b0ed1 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -38,64 +38,34 @@ class jenkinsEnv implements Serializable {
         }
     }
     def jdkFromVersion(String os, String version) {
-        switch (os) {
-            case 'linux':
-                switch (version) {
-                    case '7':
-                        return 'jdk_1.7_latest'
-                    case '8':
-                        return 'jdk_1.8_latest'
-                    case '9':
-                        return 'jdk_1.9_latest'
-                    case '10':
-                        return 'jdk_10_latest'
-                    case '11':
-                        return 'jdk_11_latest'
-                    case '12':
-                        return 'jdk_12_latest'
-                    case '13':
-                        return 'jdk_13_latest'
-                    case '14':
-                        return 'jdk_14_latest'
-                    case '15':
-                        return 'jdk_15_latest'
-                    case '16':
-                        return 'jdk_16_latest'
-                    case '17':
-                        return 'jdk_17_latest'
-                    default:
-                        return null
-                }
-            case 'windows':
-                switch(version) {
-                    case '7':
-                        return 'jdk_1.7_latest'
-                    case '8':
-                        return 'jdk_1.8_latest'
-                    case '9':
-                        return 'jdk_1.9_latest'
-                    case '10':
-                        return 'jdk_10_latest'
-                    case '11':
-                        return 'jdk_11_latest'
-                    case '12':
-                        return 'jdk_12_latest'
-                    case '13':
-                        return 'jdk_13_latest'
-                    case '14':
-                        return 'jdk_14_latest'
-                    case '15':
-                        return 'jdk_15_latest'
-                    case '16':
-                        return 'jdk_16_latest'
-                    case '17':
-                        return 'jdk_17_latest'
-                    default:
-                        return null
-                }
-            default:
-                return null
-        }
+		switch (version) {
+			case '7':
+				return 'jdk_1.7_latest'
+			case '8':
+				return 'jdk_1.8_latest'
+			case '9':
+				return 'jdk_1.9_latest'
+			case '10':
+				return 'jdk_10_latest'
+			case '11':
+				return 'jdk_11_latest'
+			case '12':
+				return 'jdk_12_latest'
+			case '13':
+				return 'jdk_13_latest'
+			case '14':
+				return 'jdk_14_latest'
+			case '15':
+				return 'jdk_15_latest'
+			case '16':
+				return 'jdk_16_latest'
+			case '17':
+				return 'jdk_17_latest'
+			case '18':
+				return 'jdk_18_latest'
+			default:
+				return null
+		}
     }
     def mvnFromVersion(String os, String version) {
         switch (os) {