You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/01/11 21:26:58 UTC
[maven-jenkins-env] branch master updated: Use maven_3_latest for 3.8.x, 3.x.x and as default on linux and windows
This is an automated email from the ASF dual-hosted git repository.
sjaranowski 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 2adf8eb Use maven_3_latest for 3.8.x, 3.x.x and as default on linux and windows
2adf8eb is described below
commit 2adf8eb96b0ceaea8f836295b677f7e704df16e6
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Wed Jan 11 20:56:32 2023 +0100
Use maven_3_latest for 3.8.x, 3.x.x and as default on linux and windows
---
vars/jenkinsEnv.groovy | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index 9f9c7bb..d2eed4b 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -37,6 +37,7 @@ class jenkinsEnv implements Serializable {
return null
}
}
+ // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
def jdkFromVersion(String os, String version) {
switch (version) {
case '7':
@@ -69,6 +70,7 @@ class jenkinsEnv implements Serializable {
return null
}
}
+ // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
def mvnFromVersion(String os, String version) {
switch (os) {
case 'linux':
@@ -86,11 +88,11 @@ class jenkinsEnv implements Serializable {
case ~/^3\.6\.[x3]$/:
return 'maven_3.6.3'
case ~/^3\.8\.x$/:
- return 'maven_3.8.6'
+ return 'maven_3_latest'
case '3.x.x':
- return 'maven_3.8.6'
+ return 'maven_3_latest'
default:
- return 'maven_3.8.6'
+ return 'maven_3_latest'
}
case 'windows':
switch(version) {
@@ -107,11 +109,11 @@ class jenkinsEnv implements Serializable {
case ~/^3\.6\.[x4]$/:
return 'maven_3.6.3_windows'
case ~/^3\.8\.x$/:
- return 'maven_latest'
+ return 'maven_3_latest'
case '3.x.x':
- return 'maven_latest'
+ return 'maven_3_latest'
default:
- return 'maven_latest'
+ return 'maven_3_latest'
}
default:
return null