use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0baa4234 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0baa4234 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0baa4234 Branch: refs/heads/master Commit: 0baa42345283f4fea3938a8ccd7c8e12b34203b1 Parents: 94c3b60 Author: Hervé Boutemy <hbout...@apache.org> Authored: Sun Mar 26 10:27:59 2017 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Tue Mar 28 08:05:56 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0baa4234/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index be4485c..b6c7e19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ node('ubuntu') { stage 'Integration Test' parallel linuxJava7:{ node('ubuntu') { - def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' + def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' echo "Driving integration tests using Maven $MAVEN_NIX_J7" def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J7" @@ -75,7 +75,7 @@ parallel linuxJava7:{ } },linuxJava8: { node('ubuntu') { - def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' + def MAVEN_NIX_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' echo "Driving integration tests using Maven $MAVEN_NIX_J8" def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J8" @@ -94,12 +94,12 @@ parallel linuxJava7:{ } }, winJava7: { node('Windows') { - def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' + def MAVEN_WIN_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J7) { MAVEN_WIN_J7=pwd() } echo "Driving integration tests using Maven $MAVEN_WIN_J7" - def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' + def JAVA_WIN_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' dir(JAVA_WIN_J7) { JAVA_WIN_J7=pwd() } @@ -124,12 +124,12 @@ parallel linuxJava7:{ } }, winJava8: { node('Windows') { - def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' + def MAVEN_WIN_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J8) { MAVEN_WIN_J8=pwd() } echo "Driving integration tests using Maven $MAVEN_WIN_J8" - def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' + def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK' dir(JAVA_WIN_J8) { JAVA_WIN_J8=pwd() }
