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:29 UTC
[maven] branch reproducible updated (706a3dd -> 2aff799)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 706a3dd removed initial build: parallel is sufficient
new 9eb0691 renamed stageId to buildId
new 7e52a7d generate also source packages
new 2aff799 try to add Git commit id to buildId
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 9 ++++++++-
apache-maven/pom.xml | 7 +++++--
apache-maven/src/main/assembly/bin.xml | 2 +-
apache-maven/src/main/assembly/src.xml | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
[maven] 02/03: generate also source packages
Posted by hb...@apache.org.
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 7e52a7d3dd8b2e9fc35421e37802d7f81d7adbf1
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Sep 24 22:53:15 2019 +0200
generate also source packages
---
apache-maven/pom.xml | 3 +++
apache-maven/src/main/assembly/src.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 076f76d..48fed66 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -184,6 +184,7 @@ under the License.
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -211,6 +212,8 @@ under the License.
<includes>
<include>${project.artifactId}-${project.version}-bin-${buildId}.zip</include>
<include>${project.artifactId}-${project.version}-bin-${buildId}.tar.gz</include>
+ <include>${project.artifactId}-${project.version}-src-${buildId}.zip</include>
+ <include>${project.artifactId}-${project.version}-src-${buildId}.tar.gz</include>
</includes>
</fileSet>
</fileSets>
diff --git a/apache-maven/src/main/assembly/src.xml b/apache-maven/src/main/assembly/src.xml
index 327ed52..6ca2550 100644
--- a/apache-maven/src/main/assembly/src.xml
+++ b/apache-maven/src/main/assembly/src.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>src</id>
+ <id>src-${buildId}</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
[maven] 03/03: try to add Git commit id to buildId
Posted by hb...@apache.org.
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 2aff799af81230849f90cc7d5a3a41f1420e55c5
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Sep 24 23:03:17 2019 +0200
try to add Git commit id to buildId
---
Jenkinsfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 023179b..805e7ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,7 +61,7 @@ for (String os in runITsOses) {
def cmd = [
'mvn', 'clean',
'verify',
- '-DskipTests', '-Drat.skip', "-DbuildId=${os}-jdk${jdk}"
+ '-DskipTests', '-Drat.skip'
]
if (jdk == '7') {
// Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
@@ -85,6 +85,13 @@ for (String os in runITsOses) {
invokerPublisher(),
pipelineGraphPublisher()
]) {
+ commitId = ''
+ if (isUnix()) {
+ commitId = sh(returnStdout: true, script: 'git rev-parse HEAD')
+ } else {
+ commitId = bat(returnStdout: true, script: 'git rev-parse HEAD')
+ }
+ cmd += "-DbuildId=${os}-jdk${jdk}-${commitId}"
if (isUnix()) {
sh cmd.join(' ')
} else {
[maven] 01/03: renamed stageId to buildId
Posted by hb...@apache.org.
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>