This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master-jenkinsfile by this
push:
new 940a08cc21 use mvnw
940a08cc21 is described below
commit 940a08cc211d4d130b548f8fd1863126283fbfa1
Author: Olivier Lamy <[email protected]>
AuthorDate: Sat Mar 8 12:54:27 2025 +1000
use mvnw
Signed-off-by: Olivier Lamy <[email protected]>
---
Jenkinsfile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 65b1b254ea..1f1592ce34 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,11 +21,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr:
'5', numToKeepStr: e
def buildOs = 'linux'
def buildJdk = '17'
-def buildMvn = 'maven3'
+def buildMvn = '4.0.0-rc-2'
def runITsOses = ['linux']
def runITsJdks = ['17', '21']
-def runITsMvn = 'maven3'
-def runITscommand = "mvn clean install -Prun-its -B -U -V" //
-DmavenDistro=... -Dmaven.test.failure.ignore=true
+def runITsMvn = '4.0.0-rc-2'
+def runITscommand = "./mvnw clean install -Prun-its -B -U -V" //
-DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
try {
@@ -48,12 +48,12 @@ node(jenkinsEnv.nodeSelection(osNode)) {
stage('Build / Unit Test') {
String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
- String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
try {
withEnv(["JAVA_HOME=${ tool "$jdkName" }",
- "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool
"$mvnName"}/bin",
- "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"])
{
- sh "mvn clean ${MAVEN_GOAL} -B -U -e -fae -V
-Dmaven.test.failure.ignore -Dmaven.repo.local=${WORK_DIR}/.repository"
+ "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool
maven_latest}/bin",
+ "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"])
{
+ sh "mvn --errors --batch-mode --show-version
org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=${buildMvn}"
+ sh "./mvnw clean ${MAVEN_GOAL} -B -U -e -fae -V
-Dmaven.test.failure.ignore -Dmaven.repo.local=${WORK_DIR}/.repository"
}
} finally {
junit testResults:
'**/target/surefire-reports/*.xml,**/target/failsafe-reports/*.xml',
allowEmptyResults: true
@@ -67,7 +67,6 @@ for (String os in runITsOses) {
for (def jdk in runITsJdks) {
String osLabel = jenkinsEnv.labelForOS(os);
String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
- String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}")
echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
String stageId = "${os}-jdk${jdk}"
@@ -85,9 +84,10 @@ for (String os in runITsOses) {
dir ('maven') {
checkout scm
withEnv(["JAVA_HOME=${ tool "$jdkName" }",
- "PATH+MAVEN=${ tool "$jdkName"
}/bin:${tool "$mvnName"}/bin",
+ "PATH+MAVEN=${ tool "$jdkName"
}/bin:${tool maven_latest}/bin",
"MAVEN_OPTS=-Xms2g -Xmx4g
-Djava.awt.headless=true"]) {
- sh "mvn clean install -B -U -e -DskipTests
-V -PversionlessMavenDist -Dmaven.repo.local=${WORK_DIR}/.repository"
+ sh "mvn --errors --batch-mode
--show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper
-Dmaven=${buildMvn}"
+ sh "./mvnw clean install -B -U -e
-DskipTests -V -PversionlessMavenDist
-Dmaven.repo.local=${WORK_DIR}/.repository"
}
}
dir ('its') {
@@ -109,8 +109,9 @@ for (String os in runITsOses) {
try {
withEnv(["JAVA_HOME=${ tool "$jdkName" }",
- "PATH+MAVEN=${ tool "$jdkName"
}/bin:${tool "$mvnName"}/bin",
+ "PATH+MAVEN=${ tool "$jdkName"
}/bin:${tool maven_latest}/bin",
"MAVEN_OPTS=-Xms2g -Xmx4g
-Djava.awt.headless=true"]) {
+ sh "mvn --errors --batch-mode
--show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper
-Dmaven=${buildMvn}"
String cmd = "${runITscommand}
-Dmaven.repo.local=$WORK_DIR/.repository
-DmavenDistro=$WORK_DIR/maven/apache-maven/target/apache-maven-bin.zip
-Dmaven.test.failure.ignore"
if (isUnix()) {
