You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/23 14:47:15 UTC
[royale-compiler] branch develop updated: - Removed the
line-separator setting as this causes the Antlr3 plugin to crash the VM -
Added the latest version of the reproducible-build-maven-plugin - Went back
to the last development version to re-try releasing with the new settings
in place
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 4696f5a - Removed the line-separator setting as this causes the Antlr3 plugin to crash the VM - Added the latest version of the reproducible-build-maven-plugin - Went back to the last development version to re-try releasing with the new settings in place
new 2b1cd9a Merge pull request #128 from chrisdutz/develop
4696f5a is described below
commit 4696f5a8d68b5431afc46264c379faa7bd43e6e2
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Mar 23 15:44:53 2020 +0100
- Removed the line-separator setting as this causes the Antlr3 plugin to crash the VM
- Added the latest version of the reproducible-build-maven-plugin
- Went back to the last development version to re-try releasing with the new settings in place
---
compiler-common/pom.xml | 4 ++--
compiler-externc/pom.xml | 8 ++++----
compiler-jx/pom.xml | 14 +++++++-------
compiler-test-utils/pom.xml | 4 ++--
compiler/pom.xml | 10 +++++-----
debugger/pom.xml | 8 ++++----
flex-compiler-oem/pom.xml | 10 +++++-----
pom.xml | 29 ++++++++++++++++++++++++++---
royale-ant-tasks/pom.xml | 4 ++--
royale-maven-plugin/pom.xml | 4 ++--
royaleunit-ant-tasks/pom.xml | 4 ++--
swfutils/pom.xml | 4 ++--
12 files changed, 63 insertions(+), 40 deletions(-)
diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml
index 773ea34..7a4274a 100644
--- a/compiler-common/pom.xml
+++ b/compiler-common/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>compiler-common</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-Common</name>
<description>The Apache Royale Compiler Common classes</description>
diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml
index b0aecb1..41d575c 100644
--- a/compiler-externc/pom.xml
+++ b/compiler-externc/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>compiler-externc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Externc</name>
<description>The Apache Royale Compiler Externs Compiler</description>
@@ -243,7 +243,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.javascript</groupId>
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 0e4654f..4e8ac44 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>compiler-jx</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-JX</name>
@@ -179,17 +179,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -233,7 +233,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 258c08d..b569fe7 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Test Utils</name>
<description>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 6bed104..f27b501 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>compiler</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler</name>
<description>The Apache Royale Compiler</description>
@@ -553,7 +553,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flex</groupId>
@@ -605,13 +605,13 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 265b927..deec910 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>debugger</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: Debugger</name>
@@ -82,12 +82,12 @@ Do all the JBurg code generation.
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index 274a017..e6fb551 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>flex-compiler-oem</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: OEM Layer</name>
@@ -35,17 +35,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-jx</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 5555af3..822e769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Royale: Compiler: Parent</name>
@@ -200,8 +200,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <!-- Add settings to streamline the line separators on windows and mac/linux -->
- <arguments combine.self="override">-P${release-profiles} -Dline.separator='\n'</arguments>
+ <arguments combine.self="override">-P${release-profiles}</arguments>
</configuration>
</plugin>
@@ -328,6 +327,24 @@
</executions>
</plugin>
+ <!-- This plugin cleans up the jars for anything that might cause problems for reproducible builds -->
+ <!--
+ Even if the core maven plugins currently would support doing this without, we would be required
+ to set the line-separator and the Antlr3 plugin crashes if this is set to something non-default
+ -->
+ <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>
+
<!-- Plugin to detect problems with JDK incompatibilities -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -458,6 +475,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archiver-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index a770163..3914497 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>royale-ant-tasks</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Royale Ant Tasks</name>
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index e44bd90..3d1ec6f 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>royale-maven-plugin</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Royale: Royale Maven Plugin</name>
diff --git a/royaleunit-ant-tasks/pom.xml b/royaleunit-ant-tasks/pom.xml
index 2907526..58c2a96 100644
--- a/royaleunit-ant-tasks/pom.xml
+++ b/royaleunit-ant-tasks/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>royaleunit-ant-tasks</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: RoyaleUnit Ant Tasks</name>
diff --git a/swfutils/pom.xml b/swfutils/pom.xml
index 0df314d..7b278e2 100644
--- a/swfutils/pom.xml
+++ b/swfutils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>swfutils</artifactId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<name>Apache Royale: Compiler: SWFUtils</name>
<description>The Apache Royale Compiler SWF Utility classes</description>