You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/11/05 09:21:55 UTC
[plc4x] 01/02: - Finished configuring the reproducible builds.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/reproducible-builds
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 46b56e2a36a084292882a79f0b2468cf3c58ad05
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Nov 4 20:23:27 2019 +0100
- Finished configuring the reproducible builds.
---
build-reproducible.sh | 2 +-
compare-reproducible.sh | 4 ++--
plc4j/pom.xml | 1 +
pom.xml | 13 ++++++++++---
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/build-reproducible.sh b/build-reproducible.sh
index f5996c4..885dbf5 100755
--- a/build-reproducible.sh
+++ b/build-reproducible.sh
@@ -21,7 +21,7 @@
# Run a standard build
function build() {
echo "Building ..."
- mvn -U -P apache-release,with-boost,with-java,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy
+ mvn -U -P apache-release,with-boost,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy
echo "Done"
}
diff --git a/compare-reproducible.sh b/compare-reproducible.sh
index 105c20e..1d8bb4d 100755
--- a/compare-reproducible.sh
+++ b/compare-reproducible.sh
@@ -35,7 +35,7 @@ function compare() {
pwd
}
-#unpack $1
-#unpack $2
+unpack $1
+unpack $2
compare ${1%.*} ${2%.*} > compare.log
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 5115ef4..58645bd 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -184,6 +184,7 @@
<exportScr>true</exportScr>
<instructions>
<_include>-bnd.bnd</_include>
+ <_removeheaders>Bnd-LastModified,Built-By</_removeheaders>
</instructions>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index 064a955..d69c8f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
<!-- Timestamp for the reproducible builds -->
- <project.build.outputTimestamp>2019-11-01T010:30:00Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2019-11-01T10:30:00Z</project.build.outputTimestamp>
<!-- URL of the ASF SonarQube server -->
<sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
@@ -137,7 +137,7 @@
<jackson.version>2.9.9</jackson.version>
<jmh.version>1.21</jmh.version>
<jna.version>5.3.1</jna.version>
- <joda-time.version>2.10</joda-time.version>
+ <joda-time.version>2.10.5</joda-time.version>
<jopt-simple.version>5.0.2</jopt-simple.version>
<jserialcom.version>2.5.1</jserialcom.version>
<junit.jupiter.version>5.5.0</junit.jupiter.version>
@@ -762,7 +762,7 @@
<source>${project.basedir}/src/main/script/prerequisiteCheck.groovy</source>
</configuration>
</execution>
- <!-- Set some dynamic variables which are usefull for the site generation -->
+ <!-- Set some dynamic variables which are useful for the site generation -->
<execution>
<id>provide-custom-properties</id>
<phase>pre-site</phase>
@@ -805,6 +805,13 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10.5</version>
+ </dependency>
+ </dependencies>
</plugin>
<!-- Write all the properties into a file so we can access them from asciidoctor -->