You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/15 11:34:33 UTC
[maven] branch MNG-5937 updated: Adjust Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-5937
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-5937 by this push:
new ff5f43f Adjust Jenkinsfile
ff5f43f is described below
commit ff5f43f868cbac6833bb894202177d3685b57958
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri May 15 13:34:22 2020 +0200
Adjust Jenkinsfile
---
Jenkinsfile | 11 +++--------
apache-maven/pom.xml | 6 ++++++
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5767322..278a19d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,11 +60,10 @@ node(jenkinsEnv.nodeSelection(osNode)) {
]) {
// For now: maven-wrapper contains 2 poms sharing the same outputDirectory, so separate clean
sh "mvn clean"
- sh "mvn ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore=true"
+ sh "mvn ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore=true -P versionlessMavenDist"
}
dir ('apache-maven/target') {
- sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
- stash includes: 'apache-maven-dist.zip,apache-maven-wrapper-*.zip', name: 'maven-dist'
+ stash includes: 'apache-maven-bin.zip,apache-maven-wrapper-*.zip', name: 'maven-dist'
}
dir ('maven-wrapper/target') {
stash includes: 'maven-wrapper.jar', name: 'wrapper-dist'
@@ -104,16 +103,12 @@ for (String os in runITsOses) {
dir('dists') {
unstash 'maven-dist'
unstash 'wrapper-dist'
-
- if (isUnix()) {
- sh 'zipinfo apache-maven-wrapper-3.7.0-SNAPSHOT-bin.zip'
- }
}
try {
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/dists/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -DmavenWrapper=$WORK_DIR/dists/maven-wrapper.jar -DwrapperDistroDir=${WORK_DIR}/dists"
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/dists/apache-maven-bin.zip -Dmaven.test.failure.ignore=true -DmavenWrapper=$WORK_DIR/dists/maven-wrapper.jar -DwrapperDistroDir=${WORK_DIR}/dists"
if (isUnix()) {
sh 'df -hT'
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 3e82b32..d0271d0 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -331,5 +331,11 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>versionlessMavenDist</id>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ </build>
+ </profile>
</profiles>
</project>