(maven) branch master-jenkinsfile updated: fix build of temporary distro

[olamy]

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 1e61a40b0b fix build of temporary distro
1e61a40b0b is described below

commit 1e61a40b0b40a196ca95b0b8a70cf8d1776edbe9
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Mar 8 13:26:02 2025 +1000

    fix build of temporary distro
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 Jenkinsfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b7a0b76601..0724822e02 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ def buildMvn = '4.0.0-rc-2'
 def runITsOses = ['linux']
 def runITsJdks = ['17', '21']
 def runITsMvn = '4.0.0-rc-2'
-def runITscommand = "./mvnw clean install -Prun-its -B -U -V" // 
-DmavenDistro=... -Dmaven.test.failure.ignore=true
+def runITscommand = "mvnw clean install -Prun-its -B -U -V" // 
-DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests
 
 try {
@@ -87,7 +87,7 @@ for (String os in runITsOses) {
                                          "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 install -B -U -e 
-DskipTests -V -PversionlessMavenDist 
-Dmaven.repo.local=${WORK_DIR}/.repository"
+                                    sh "./mvnw clean install -B -U -e 
-DskipTests -V -DdistributionTargetDir=${WORK_DIR}/.apache-maven-master 
-Dmaven.repo.local=${WORK_DIR}/.repository"
                                 }
                             }
                             dir ('its') {
@@ -109,9 +109,10 @@ for (String os in runITsOses) {
 
                                 try {
                                     withEnv(["JAVA_HOME=${ tool "$jdkName" }",
-                                                "PATH+MAVEN=${ tool "$jdkName" 
}/bin:${tool 'maven_latest'}/bin",
+                                                "PATH+MAVEN=${ tool "$jdkName" 
}/bin:${WORK_DIR}/.apache-maven-master/bin",
+                                                
"MAVEN_HOME=${WORK_DIR}/.apache-maven-master",
                                                 "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 "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()) {