You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by jb...@apache.org on 2021/11/21 17:48:17 UTC

[felix-dev] branch master updated: [FELIX-6471] make build reproducible

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new e547ba7  [FELIX-6471] make build reproducible
     new e3b491e  Merge pull request #116 from hboutemy/master
e547ba7 is described below

commit e547ba7f70e1dec0dce6895554d6386f10157046
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Nov 13 09:37:20 2021 +0100

    [FELIX-6471] make build reproducible
---
 tools/maven-bundle-plugin/pom.xml | 82 +++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/tools/maven-bundle-plugin/pom.xml b/tools/maven-bundle-plugin/pom.xml
index f74a900..9d831e9 100644
--- a/tools/maven-bundle-plugin/pom.xml
+++ b/tools/maven-bundle-plugin/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>felix-parent</artifactId>
    <groupId>org.apache.felix</groupId>
-   <version>6</version>
+   <version>7</version>
    <relativePath>../../pom/pom.xml</relativePath>
  </parent>
 
@@ -59,6 +59,7 @@
  <properties>
    <felix.java.version>8</felix.java.version>
    <maven.site.path>bundle-plugin-archives/bundle-plugin-LATEST</maven.site.path>
+   <project.build.outputTimestamp>10</project.build.outputTimestamp>
  </properties>
 
  <build>
@@ -67,7 +68,7 @@
     <plugin>
      <groupId>org.apache.maven.plugins</groupId>
      <artifactId>maven-plugin-plugin</artifactId>
-     <version>3.4</version>
+     <version>3.6.1</version>
      <executions>
       <execution>
        <id>default-descriptor</id>
@@ -75,44 +76,44 @@
       </execution>
      </executions>
     </plugin>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <version>3.4</version>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-archiver</artifactId>
-                <version>2.6</version>
-              </dependency>
-              <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-archiver</artifactId>
-                <version>2.4.4</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.maven.doxia</groupId>
-                <artifactId>doxia-core</artifactId>
-                <version>1.6</version>
-                <exclusions>
-                  <exclusion>
-                    <artifactId>xercesImpl</artifactId>
-                    <groupId>xerces</groupId>
-                  </exclusion>
-                </exclusions>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/felix/content/components/${maven.site.path}</topSiteURL>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-scm-publish-plugin</artifactId>
-            <version>1.1</version>
-            <configuration>
-              <checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
-              <tryUpdate>true</tryUpdate>
-            </configuration>
-          </plugin>
+    <plugin>
+      <artifactId>maven-site-plugin</artifactId>
+      <version>3.4</version>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-archiver</artifactId>
+          <version>2.6</version>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-archiver</artifactId>
+          <version>2.4.4</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-core</artifactId>
+          <version>1.6</version>
+          <exclusions>
+            <exclusion>
+              <artifactId>xercesImpl</artifactId>
+              <groupId>xerces</groupId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+      </dependencies>
+      <configuration>
+        <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/felix/content/components/${maven.site.path}</topSiteURL>
+      </configuration>
+    </plugin>
+    <plugin>
+      <artifactId>maven-scm-publish-plugin</artifactId>
+      <version>1.1</version>
+      <configuration>
+        <checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
+        <tryUpdate>true</tryUpdate>
+      </configuration>
+    </plugin>
    </plugins>
   </pluginManagement>
   <plugins>
@@ -269,7 +270,6 @@
    <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugin-plugin</artifactId>
-    <version>3.4</version>
    </plugin>
    <plugin>
     <groupId>org.apache.maven.plugins</groupId>