You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/04/16 05:54:21 UTC
[royale-compiler] branch release_practice updated: switch to zlika
0.9 so we don't have to hack line-endings in javax.inject.Named
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/release_practice by this push:
new b529a7f switch to zlika 0.9 so we don't have to hack line-endings in javax.inject.Named
b529a7f is described below
commit b529a7fdaed27dc5d34feaa9cfe2e076a73234c4
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Apr 15 22:53:53 2019 -0700
switch to zlika 0.9 so we don't have to hack line-endings in javax.inject.Named
---
compiler-build-tools/pom.xml | 4 ++--
compiler-common/pom.xml | 2 +-
compiler-externc/pom.xml | 2 +-
compiler-jburg-types/pom.xml | 4 ++--
compiler-jx/pom.xml | 2 +-
compiler-test-utils/pom.xml | 2 +-
compiler/pom.xml | 2 +-
debugger/pom.xml | 2 +-
flex-compiler-oem/pom.xml | 2 +-
pom.xml | 2 +-
royale-ant-tasks/pom.xml | 2 +-
royale-maven-plugin/pom.xml | 28 +---------------------
.../src/main/sisu/javax.inject.Named | 1 -
swfutils/pom.xml | 2 +-
14 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml
index cd44d54..671870d 100644
--- a/compiler-build-tools/pom.xml
+++ b/compiler-build-tools/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -75,7 +75,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
<executions>
<execution>
<goals>
diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml
index 2972ea5..a1195c9 100644
--- a/compiler-common/pom.xml
+++ b/compiler-common/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
</plugins>
</build>
diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml
index f330555..efa2e1b 100644
--- a/compiler-externc/pom.xml
+++ b/compiler-externc/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<groupId>org.apache.royale.compiler</groupId>
diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml
index 5bc65d1..3a19ecd 100644
--- a/compiler-jburg-types/pom.xml
+++ b/compiler-jburg-types/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -53,7 +53,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
<executions>
<execution>
<goals>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index e556f44..c0a6e01 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<!-- Make the surefire execute all unit-tests -->
<plugin>
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index fd03ea1..a69393c 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
</plugins>
</build>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 8fee2e7..924cf40 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 3700d8d..3dd57b8 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<!--
Do all the JBurg code generation.
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index a57165d..bb61461 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 82d3e4b..d417606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,7 +584,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
<executions>
<execution>
<goals>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 7549b78..f1edce5 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
</plugins>
</build>
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index 2e0df47..e29593b 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -98,7 +98,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -135,32 +135,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <!--
- The javax.inject.Named file is copied over the file generated by the compiler in order to have the same line-endings on Mac and Windows so that the JAR is binary identical. The compiler generates platform line-endings in the file that ends up in META-INF resulting in binary differences.
- -->
- <execution>
- <id>copy-javax.inject.named</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <outputDirectory>${project.build.outputDirectory}/META-INF/sisu</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/sisu</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/royale-maven-plugin/src/main/sisu/javax.inject.Named b/royale-maven-plugin/src/main/sisu/javax.inject.Named
deleted file mode 100644
index 952435e..0000000
--- a/royale-maven-plugin/src/main/sisu/javax.inject.Named
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.royale.maven.trust.DefaultTrustHandler
diff --git a/swfutils/pom.xml b/swfutils/pom.xml
index e3915ca..85c5ebe 100644
--- a/swfutils/pom.xml
+++ b/swfutils/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>io.github.zlika</groupId>
<artifactId>reproducible-build-maven-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
</plugins>
</build>