You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/09/24 21:03:30 UTC

[maven] 01/03: renamed stageId to buildId

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

hboutemy pushed a commit to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 9eb069136e2f0dc8b268fff2ec9a6c4fe689c1db
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Sep 24 22:50:16 2019 +0200

    renamed stageId to buildId
---
 Jenkinsfile                            | 2 +-
 apache-maven/pom.xml                   | 4 ++--
 apache-maven/src/main/assembly/bin.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dbb8e0b..023179b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,7 +61,7 @@ for (String os in runITsOses) {
         def cmd = [
           'mvn', 'clean',
           'verify',
-          '-DskipTests', '-Drat.skip', "-DstageId=${os}-jdk${jdk}"
+          '-DskipTests', '-Drat.skip', "-DbuildId=${os}-jdk${jdk}"
         ]
         if (jdk == '7') {
           // Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8a86377..076f76d 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -209,8 +209,8 @@ under the License.
             <fileSet>
               <directory>${project.build.directory}</directory>
               <includes>
-                <include>${project.artifactId}-${project.version}-bin-${stageId}.zip</include>
-                <include>${project.artifactId}-${project.version}-bin-${stageId}.tar.gz</include>
+                <include>${project.artifactId}-${project.version}-bin-${buildId}.zip</include>
+                <include>${project.artifactId}-${project.version}-bin-${buildId}.tar.gz</include>
               </includes>
             </fileSet>
           </fileSets>
diff --git a/apache-maven/src/main/assembly/bin.xml b/apache-maven/src/main/assembly/bin.xml
index 45d79de..85c02db 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -19,7 +19,7 @@ under the License.
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>bin-${stageId}</id>
+  <id>bin-${buildId}</id>
   <formats>
     <format>zip</format>
     <format>tar.gz</format>