From bd53a5bcf206e0256c68ef0dbbcf62856d6c3ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sat, 30 Apr 2022 16:08:37 +0200
Subject: [PATCH] improve Reproducible Builds

---
 activemq-karaf-itest/pom.xml    | 25 +++++++++++++++++++++++++
 activemq-ra/pom.xml             | 26 ++++++++++++++++++++++++++
 activemq-runtime-config/pom.xml |  1 +
 activemq-spring/pom.xml         | 26 ++++++++++++++++++++++++++
 pom.xml                         | 26 +++++++-------------------
 5 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 6a39ec82d5..668a117f08 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -170,6 +170,31 @@
           </execution>
         </executions>
       </plugin>
+      <plugin><!-- workaround for https://issues.apache.org/jira/browse/SM-5021 -->
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <version>1.5.3</version>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <includes>
+            <include>${project.build.directory}/classes/META-INF/maven/dependencies.properties</include>
+          </includes>
+          <replacements>
+            <replacement>
+              <token># Generated at: ... ... .+</token>
+              <value>#</value>
+            </replacement>
+          </replacements>
+          <regex>true</regex>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 2949811c70..f5b81de575 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -99,6 +99,32 @@
           </execution>
         </executions>
       </plugin>
+      <plugin><!-- workaround for https://issues.apache.org/jira/browse/XBEAN-335 -->
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <version>1.5.3</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <basedir>${project.build.directory}/xbean/META-INF</basedir>
+          <includes>
+            <include>spring.*</include>
+          </includes>
+          <replacements>
+            <replacement>
+              <token>#... ... .+</token>
+              <value>#</value>
+            </replacement>
+          </replacements>
+          <regex>true</regex>
+        </configuration>
+      </plugin>
 
       <!--  lets ensure that the XSD gets deployed  -->
       <plugin>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 8b3f4ed2cb..0157d31720 100644
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -136,6 +136,7 @@
                  <xsd>${basedir}/../activemq-spring/target/classes/activemq.xsd</xsd>
                  <bindingFile>${basedir}/src/main/resources/binding.xjb</bindingFile>
                  <extensionArgs>
+            		<extensionArgs>-no-header</extensionArgs>
             		<extensionArgs>-XtoString</extensionArgs>
             		<extensionArgs>-XhashCode</extensionArgs>
             		<extensionArgs>-Xequals</extensionArgs>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 00773b7e38..dab34964a5 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -230,6 +230,32 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin><!-- workaround for https://issues.apache.org/jira/browse/XBEAN-335 -->
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <version>1.5.3</version>
+        <executions>
+          <execution>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <basedir>${project.build.directory}/classes/META-INF</basedir>
+          <includes>
+            <include>spring.*</include>
+          </includes>
+          <replacements>
+            <replacement>
+              <token>#... ... .+</token>
+              <value>#</value>
+            </replacement>
+          </replacements>
+          <regex>true</regex>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index f01d9677a3..0536dc68f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,13 +125,13 @@
     <maven-surefire-plugin-version>3.0.0-M6</maven-surefire-plugin-version>
     <maven-antrun-plugin-version>3.0.0</maven-antrun-plugin-version>
     <maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
-    <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
+    <maven-release-plugin-version>3.0.0-M5</maven-release-plugin-version>
     <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
     <maven-enforcer-plugin-version>3.1.0</maven-enforcer-plugin-version>
     <maven-war-plugin-version>3.3.2</maven-war-plugin-version>
     <maven-compiler-plugin-version>3.10.1</maven-compiler-plugin-version>
+    <maven-rar-plugin-version>3.0.0</maven-rar-plugin-version>
     <maven-jar-plugin-version>3.2.2</maven-jar-plugin-version>
-    <maven-archiver-version>2.5</maven-archiver-version>
     <maven-source-plugin-version>3.2.1</maven-source-plugin-version>
     <maven-javadoc-plugin-version>3.3.2</maven-javadoc-plugin-version>
     <maven-install-plugin-version>2.5.2</maven-install-plugin-version>
@@ -240,7 +240,7 @@
     <connection>scm:git:http://gitbox.apache.org/repos/asf/activemq.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq.git</developerConnection>
     <url>https://github.com/apache/activemq</url>
-    <tag>activemq-5.16.0</tag>
+    <tag>main</tag>
   </scm>
 
   <dependencyManagement>
@@ -1137,18 +1137,6 @@
             <suppressCommitBeforeTag>false</suppressCommitBeforeTag>
             <tagNameFormat>activemq-@{project.version}</tagNameFormat>
           </configuration>
-          <dependencies>
-            <dependency>
-             <groupId>org.apache.maven.scm</groupId>
-             <artifactId>maven-scm-api</artifactId>
-             <version>1.8.1</version>
-            </dependency>
-          <dependency>
-             <groupId>org.apache.maven.scm</groupId>
-             <artifactId>maven-scm-provider-gitexe</artifactId>
-             <version>1.8.1</version>
-           </dependency>
-         </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1220,13 +1208,13 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin-version}</version>
+          <artifactId>maven-rar-plugin</artifactId>
+          <version>${maven-rar-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-archiver</artifactId>
-          <version>${maven-archiver-version}</version>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven-compiler-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>