Adding JDK 18
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 @@
}
}
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) {
