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/01 09:54:22 UTC

[plc4x] 01/01: - Updated the versions of the maven plugins: -- maven-jar-plugin -- maven-source-plugin -- maven-assembly-plugin - Added a fixed timestamp value to the master pom - Fixed the version of the base image used in the Dockerfile

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 24228fe5f72151f6eac79e3a32437819713fc700
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Nov 1 10:54:10 2019 +0100

    - Updated the versions of the maven plugins:
    -- maven-jar-plugin
    -- maven-source-plugin
    -- maven-assembly-plugin
    - Added a fixed timestamp value to the master pom
    - Fixed the version of the base image used in the Dockerfile
---
 Dockerfile |  6 +++---
 pom.xml    | 45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3771197..b3871bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,8 @@
 
 # This is the image we'll use to execute the build (and give it the name 'build').
 # (This image is based on Ubuntu)
-FROM azul/zulu-openjdk:latest as build
+# Fixed version of this in order to have a fixed JDK version
+FROM azul/zulu-openjdk:8.42.0.21 as build
 
 # Install some stuff we need to run the build
 RUN apt update -y
@@ -62,11 +63,10 @@ WORKDIR /ws
 # (Tried a patched version of the plugin to allow exclusion of inner artifacts.
 # See https://issues.apache.org/jira/browse/MDEP-568 for details)
 RUN ./mvnw -P with-java,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-sandbox com.offbytwo.maven.plugins:maven-dependency-plugin:3.1.1.MDEP568:go-offline -DexcludeGroupIds=org.apache.plc4x,org.apache.plc4x.examples,org.apache.plc4x.sandbox
+
 # Build everything with all tests
 RUN ./mvnw -P with-java,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-sandbox install
 
-#RUN ./mvnw -P with-java -DskipTests install
-
 # Get the version of the project and save it in a local file on the container
 RUN ./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -DforceStdout -q -pl . > project_version
 
diff --git a/pom.xml b/pom.xml
index 36fc2e0..e020949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,6 @@
 
   <properties>
     <!--
-      3.0.5 would have been enough, but special plugins require newer Maven versions:
-      At least 3.2 required for jqassistant-maven-plugin
       At least 3.3.3 required for camel-package-maven-plugin
     -->
     <maven.version>3.3.3</maven.version>
@@ -97,6 +95,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
 
+    <!-- Timestamp for the reproducible builds -->
+    <project.build.outputTimestamp>2019-11-01T010:30:00Z</project.build.outputTimestamp>
+
     <!-- URL of the ASF SonarQube server -->
     <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
     <!-- Exclude all generated code -->
@@ -1214,7 +1215,14 @@
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.0</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -1229,7 +1237,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.0</version>
           <configuration>
             <finalName>apache-plc4x-${project.version}</finalName>
           </configuration>
@@ -1502,6 +1510,37 @@
         <enabled>true</enabled>
       </snapshots>
     </pluginRepository>
+    <!-- Added the staging repos for the unreleased maven plugins -->
+    <pluginRepository>
+      <id>maven-reproducible-build-jar-plugin-staging</id>
+      <url>https://repository.apache.org/content/repositories/maven-1533/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>maven-reproducible-build-source-plugin-staging</id>
+      <url>https://repository.apache.org/content/repositories/maven-1532/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>maven-reproducible-build-assembly-plugin-staging</id>
+      <url>https://repository.apache.org/content/repositories/maven-1534/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
   </pluginRepositories>
 
   <profiles>