You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/01/09 11:14:08 UTC
[sling-parent] branch master updated: SLING-8951 enable
reproducible builds
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 504e20d SLING-8951 enable reproducible builds
504e20d is described below
commit 504e20d9839ea74c5f140d83636eb4d9d6bb0c58
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jan 9 12:13:55 2020 +0100
SLING-8951 enable reproducible builds
---
sling-bundle-parent/pom.xml | 3 +++
sling-parent/pom.xml | 21 +++++++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml
index 1da0003..7189891 100644
--- a/sling-bundle-parent/pom.xml
+++ b/sling-bundle-parent/pom.xml
@@ -74,6 +74,9 @@ Bundle-Category: sling
# compare with https://www.mail-archive.com/dev@sling.apache.org/msg76177.html
-snapshot: ${tstamp;yyyyMMddHHmmssSSS}
+# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
+-noextraheaders: true
+
# we cannot let bnd-maven-plugin generate it automatically, as Maven applies some inheritance logic which is incorrect for Sling (https://issues.apache.org/jira/browse/SLING-8537)
Bundle-DocURL: http://sling.apache.org
]]></bnd>
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index 0b65fb4..d905887 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>22</version>
<relativePath />
</parent>
@@ -290,15 +290,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M1</version>
- <!-- overwrite wait time set in ASF Parent, as Sling only uses Git -->
- <configuration>
- <waitBeforeTagging>0</waitBeforeTagging>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.12.1</version>
</plugin>
@@ -314,6 +305,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
</plugin>
@@ -324,6 +320,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>