This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push: new d8794b5 - Made the utils reporducible builds too - Bumped the apache parent version for the utils to the latest version 23 - Adjusted the releasesteps.xml to work with the changed directory structure new 24f814d Merge pull request #131 from chrisdutz/develop d8794b5 is described below commit d8794b5abbe9e045628e917f19a3e17c1aabb6d3 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Mon Mar 23 18:43:18 2020 +0100 - Made the utils reporducible builds too - Bumped the apache parent version for the utils to the latest version 23 - Adjusted the releasesteps.xml to work with the changed directory structure --- compiler-build-tools/pom.xml | 15 ++++++++++++++- compiler-jburg-types/pom.xml | 15 ++++++++++++++- releasesteps.xml | 19 ++++++++++++------- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml index 4129b19..a04dbdc 100644 --- a/compiler-build-tools/pom.xml +++ b/compiler-build-tools/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>22</version> + <version>23</version> <relativePath /> </parent> @@ -107,6 +107,19 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> </plugin> + <!-- This plugin cleans up the jars for anything that might cause problems for reproducible builds --> + <plugin> + <groupId>io.github.zlika</groupId> + <artifactId>reproducible-build-maven-plugin</artifactId> + <version>0.11</version> + <executions> + <execution> + <goals> + <goal>strip-jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml index 836d3ec..f9633e4 100644 --- a/compiler-jburg-types/pom.xml +++ b/compiler-jburg-types/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>22</version> + <version>23</version> <relativePath/> </parent> @@ -81,6 +81,19 @@ </tags> </configuration> </plugin> + <!-- This plugin cleans up the jars for anything that might cause problems for reproducible builds --> + <plugin> + <groupId>io.github.zlika</groupId> + <artifactId>reproducible-build-maven-plugin</artifactId> + <version>0.11</version> + <executions> + <execution> + <goals> + <goal>strip-jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/releasesteps.xml b/releasesteps.xml index 166fae1..9df8a0a 100644 --- a/releasesteps.xml +++ b/releasesteps.xml @@ -131,6 +131,8 @@ <target name="unzip-artifacts-utils" if="utils"> <mkdir dir="${artifactfolder}/artifacts" /> <unzip src="${artifactfolder}/archive_utils.zip" dest="${artifactfolder}/artifacts"/> + <copydir src="${artifactfolder}/artifacts/archive/target/utils/local-release-dir/org/apache/royale/compiler" + dest="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler"/> </target> <target name="unzip-artifacts" if="artifactfolder"> <antcall target="unzip-artifacts-utils" /> @@ -138,12 +140,15 @@ <unzip src="${artifactfolder}/archive.zip" dest="${artifactfolder}/artifacts"/> </target> <target name="build-source-utils" if="utils"> - <!-- build these modules --> - <exec executable="${mvn}" dir="${artifactfolder}/sources" failonerror="true" > - <arg value="clean" /> - <arg value="install" /> - <arg value="-P" /> - <arg value="-main,utils" /> + <!-- build the build tools --> + <exec executable="${mvn}" dir="${artifactfolder}/sources/compiler-build-tools" failonerror="true" > + <arg value="clean" /> + <arg value="install" /> + </exec> + <!-- build the jburg types --> + <exec executable="${mvn}" dir="${artifactfolder}/sources/compiler-jburg-types" failonerror="true" > + <arg value="clean" /> + <arg value="install" /> </exec> </target> <target name="build-source" > @@ -153,7 +158,7 @@ </unzip> <antcall target="build-source-utils" /> - <!-- build these modules --> + <!-- build the main project --> <exec executable="${mvn}" dir="${artifactfolder}/sources" failonerror="true" > <arg value="clean" /> <arg value="install" />