[maven] 01/01: [MNG-6914] use new apache-maven-wrapper module

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit c323cd3ac3f579346d0f8ab551463658d0bad77c
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Tue Oct 12 12:39:56 2021 +0200

    [MNG-6914] use new apache-maven-wrapper module
---
 Jenkinsfile     | 6 +++++-
 Jenkinsfile.its | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54b8652..15947ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,10 @@ node(jenkinsEnv.nodeSelection(osNode)) {
                 sh "mvn ${MAVEN_GOAL} -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -P versionlessMavenDist"
             }
             dir ('apache-maven/target') {
-                stash includes: 
'apache-maven-bin.zip,apache-maven-wrapper-*.zip', name: 'maven-dist'
+                stash includes: 'apache-maven-bin.zip', name: 'maven-dist'
+            }
+            dir ('apache-maven-wrapper/target') {
+                stash includes: 'apache-maven-wrapper-*.zip', name: 
'maven-wrapper-dist'
             }
             dir ('maven-wrapper/target') {
                 stash includes: 'maven-wrapper.jar', name: 'wrapper-dist'
@@ -102,6 +105,7 @@ for (String os in runITsOses) {
                         }
                         dir('dists') {
                           unstash 'maven-dist'
+                          unstash 'maven-wrapper-dist'
                           unstash 'wrapper-dist'
                         }
                         try {
diff --git a/Jenkinsfile.its b/Jenkinsfile.its
index 5df3e2c..8258613 100644
--- a/Jenkinsfile.its
+++ b/Jenkinsfile.its
@@ -41,7 +41,7 @@ pipeline {
         git url: "https://github.com/apache/maven-integration-testing.git";, 
branch: "${ITS_BRANCH}"
         sh "ls -lrt ${env.WORKSPACE}/apache-maven/target/"
         withEnv(["JAVA_HOME=${ tool "JDK 1.8 (latest)" }", "PATH+MAVEN=${tool 
'Maven 3.6.3'}/bin:${env.JAVA_HOME}/bin"]) {
-          sh "mvn clean install -V -B -Prun-its,embedded 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=${env.WORKSPACE}/repo  
-DmavenDistro=${env.WORKSPACE}/apache-maven/target/apache-maven-bin.zip 
-DwrapperDistroDir=${env.WORKSPACE}/apache-maven/target 
-DmavenWrapper=${env.WORKSPACE}/maven-wrapper/target/maven-wrapper.jar"
+          sh "mvn clean install -V -B -Prun-its,embedded 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=${env.WORKSPACE}/repo  
-DmavenDistro=${env.WORKSPACE}/apache-maven/target/apache-maven-bin.zip 
-DwrapperDistroDir=${env.WORKSPACE}/apache-maven-wrapper/target 
-DmavenWrapper=${env.WORKSPACE}/maven-wrapper/target/maven-wrapper.jar"
         }
       }
     }