Merge pull request #836 from hboutemy/main

improve Reproducible Builds
This commit is contained in:
Jean-Baptiste Onofré 2022-11-15 14:12:10 +01:00 committed by GitHub
commit cc28773d57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 85 additions and 19 deletions

View File

@ -170,6 +170,31 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>

View File

@ -99,6 +99,32 @@
</execution> </execution>
</executions> </executions>
</plugin> </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 --> <!-- lets ensure that the XSD gets deployed -->
<plugin> <plugin>

View File

@ -136,6 +136,7 @@
<xsd>${basedir}/../activemq-spring/target/classes/activemq.xsd</xsd> <xsd>${basedir}/../activemq-spring/target/classes/activemq.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/binding.xjb</bindingFile> <bindingFile>${basedir}/src/main/resources/binding.xjb</bindingFile>
<extensionArgs> <extensionArgs>
<extensionArgs>-no-header</extensionArgs>
<extensionArgs>-XtoString</extensionArgs> <extensionArgs>-XtoString</extensionArgs>
<extensionArgs>-XhashCode</extensionArgs> <extensionArgs>-XhashCode</extensionArgs>
<extensionArgs>-Xequals</extensionArgs> <extensionArgs>-Xequals</extensionArgs>

View File

@ -230,6 +230,32 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>

26
pom.xml
View File

@ -125,13 +125,13 @@
<maven-surefire-plugin-version>3.0.0-M6</maven-surefire-plugin-version> <maven-surefire-plugin-version>3.0.0-M6</maven-surefire-plugin-version>
<maven-antrun-plugin-version>3.0.0</maven-antrun-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-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-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-enforcer-plugin-version>3.1.0</maven-enforcer-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-war-plugin-version>3.3.2</maven-war-plugin-version>
<maven-compiler-plugin-version>3.10.1</maven-compiler-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-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-source-plugin-version>3.2.1</maven-source-plugin-version>
<maven-javadoc-plugin-version>3.3.2</maven-javadoc-plugin-version> <maven-javadoc-plugin-version>3.3.2</maven-javadoc-plugin-version>
<maven-install-plugin-version>2.5.2</maven-install-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> <connection>scm:git:http://gitbox.apache.org/repos/asf/activemq.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq.git</developerConnection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq.git</developerConnection>
<url>https://github.com/apache/activemq</url> <url>https://github.com/apache/activemq</url>
<tag>activemq-5.16.0</tag> <tag>main</tag>
</scm> </scm>
<dependencyManagement> <dependencyManagement>
@ -1137,18 +1137,6 @@
<suppressCommitBeforeTag>false</suppressCommitBeforeTag> <suppressCommitBeforeTag>false</suppressCommitBeforeTag>
<tagNameFormat>activemq-@{project.version}</tagNameFormat> <tagNameFormat>activemq-@{project.version}</tagNameFormat>
</configuration> </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>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1220,13 +1208,13 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-rar-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version> <version>${maven-rar-plugin-version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven-archiver-version}</version> <version>${maven-compiler-plugin-version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>