You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/07/03 09:55:10 UTC
[camel] branch camel-3.x updated: improve reproducible builds
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 9d271f79e6d improve reproducible builds
9d271f79e6d is described below
commit 9d271f79e6d5e2fbfac8a2ae11880424848bf901
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Jul 1 23:49:58 2023 +0200
improve reproducible builds
---
.../java/org/apache/felix/bundleplugin/ManifestPlugin.java | 4 ++++
parent/pom.xml | 2 +-
pom.xml | 14 +++-----------
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index 366ae994c9b..2eafb0be15b 100644
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -44,6 +44,7 @@ import java.util.zip.ZipFile;
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.Instructions;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Resource;
@@ -237,6 +238,9 @@ public class ManifestPlugin extends BundlePlugin {
if (analyzer.getProperty(DependencyEmbedder.EMBED_DEPENDENCY) != null && isOutputDirectory) {
analyzer.build();
} else {
+ // FELIX-6495: workaround BND inconsistency: internal jar does not take "-reproducible" flag into account...
+ analyzer.getJar().setReproducible( "true".equals( analyzer.getProperties().getProperty( Constants.REPRODUCIBLE ) ) );
+
analyzer.mergeManifest(analyzer.getJar().getManifest());
analyzer.getJar().setManifest(analyzer.calcManifest());
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4709bd066cf..6dce15a68b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -257,7 +257,7 @@
<jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
<jackrabbit-version>2.21.13</jackrabbit-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
- <jandex-version>3.0.3</jandex-version>
+ <jandex-version>3.1.0</jandex-version>
<jansi-version>2.4.0</jansi-version>
<jasypt-version>1.9.3</jasypt-version>
<java-grok-version>0.1.9</java-grok-version>
diff --git a/pom.xml b/pom.xml
index 251293ee838..0d46a95c7c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <project.build.outputTimestamp>1688242060</project.build.outputTimestamp>
<maven-compiler-plugin-version>3.10.1</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
@@ -367,15 +367,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <!-- see https://issues.apache.org/jira/browse/MRELEASE-812 -->
- <version>2.4.2</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-gitexe</artifactId>
- <version>1.9</version>
- </dependency>
- </dependencies>
+ <version>3.0.1</version>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>true</pushChanges>
@@ -384,7 +376,7 @@
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
<!-- The profile we want to use when doing the release -->
- <arguments>-Prelease,apache-release,sourcecheck,hibernate</arguments>
+ <arguments>-Prelease,sourcecheck,hibernate</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>