ZOOKEEPER-3980: Fix Jenkinsfiles with new tool names

eolivelli · anmolnar · commit eeb1ceb6f82b · 2020-10-20T16:21:30.000+02:00
Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: andor@apache.org Closes apache#1510 from eolivelli/fix/ZOOKEEPER-3980 and squashes the following commits: 15beb57 [Enrico Olivelli] fix java 5d8418f [Enrico Olivelli] ZOOKEEPER-3980 Fix Jenkinsfiles with new tool names
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -39,12 +39,12 @@ pipeline {
                 axes {
                     axis {
                         name 'JAVA_VERSION'
-                        values 'JDK 1.8 (latest)', 'JDK 11 (latest)'
+                        values 'jdk_1.8_latest', 'jdk_11_latest'
                     }
                 }
 
                 tools {
-                    maven "Maven (latest)"
+                    maven "maven_latest"
                     jdk "${JAVA_VERSION}"
                 }
 
diff --git a/Jenkinsfile-PreCommit b/Jenkinsfile-PreCommit
@@ -29,8 +29,8 @@ pipeline {
     }
 
     tools {
-        maven "Maven (latest)"
-        jdk "JDK 1.8 (latest)"
+        maven "maven_latest"
+        jdk "jdk_1.8_latest"
     }
 
     stages {
diff --git a/Jenkinsfile-owasp b/Jenkinsfile-owasp
@@ -28,8 +28,8 @@ pipeline {
     }
 
     tools {
-        maven "Maven (latest)"
-        jdk "JDK 1.8 (latest)"
+        maven "maven_latest"
+        jdk "jdk_1.8_latest"
     }
 
     stages {

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ pipeline {`
`39`	`39`	`axes {`
`40`	`40`	`axis {`
`41`	`41`	`name 'JAVA_VERSION'`
`42`		`- values 'JDK 1.8 (latest)', 'JDK 11 (latest)'`
	`42`	`+ values 'jdk_1.8_latest', 'jdk_11_latest'`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`tools {`
`47`		`- maven "Maven (latest)"`
	`47`	`+ maven "maven_latest"`
`48`	`48`	`jdk "${JAVA_VERSION}"`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ pipeline {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`tools {`
`32`		`- maven "Maven (latest)"`
`33`		`- jdk "JDK 1.8 (latest)"`
	`32`	`+ maven "maven_latest"`
	`33`	`+ jdk "jdk_1.8_latest"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ pipeline {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`tools {`
`31`		`- maven "Maven (latest)"`
`32`		`- jdk "JDK 1.8 (latest)"`
	`31`	`+ maven "maven_latest"`
	`32`	`+ jdk "jdk_1.8_latest"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`stages {`