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/01/21 10:27:03 UTC
[royale-compiler] branch develop updated: maven-distribution: fix
classpath on jars to make maven distribution work. This will need to be
revisited since versions are hadcoded and maven can get them in a natural
way
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 dd032d9 maven-distribution: fix classpath on jars to make maven distribution work. This will need to be revisited since versions are hadcoded and maven can get them in a natural way
dd032d9 is described below
commit dd032d909b0edbcc81906598527ca12442d44166
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Jan 21 11:26:54 2020 +0100
maven-distribution: fix classpath on jars to make maven distribution work. This will need to be revisited since versions are hadcoded and maven can get them in a natural way
---
README | 2 +-
compiler-jx/pom.xml | 14 ++++++++++++++
compiler/pom.xml | 13 +++++++++++++
debugger/pom.xml | 2 +-
pom.xml | 10 +++++++++-
5 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/README b/README
index a1376d4..b425e5e 100644
--- a/README
+++ b/README
@@ -270,7 +270,7 @@ Software Dependencies
jburg - https://repo1.maven.org/maven2/net/sourceforge/jburg/jburg/1.10.2/jburg-1.10.2.jar
jflex - https://jflex.de/jflex-1.6.0.tar.gz
lzma - http://www.java2s.com/Code/JarDownload/lzma/lzma-9.20.jar.zip
- Google Closure Compiler - http://github.com/google/closure-compiler/archive/v 20151015.zip
+ Google Closure Compiler - http://github.com/google/closure-compiler/archive/v 20181210.zip
The Google Closure Compiler includes files originally from Rhino under MPL 1.1. For
details see:
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 28e8b85..2841f08 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -35,6 +35,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>false</Sealed>
+ <Class-Path>commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar</Class-Path>
+ <!-- google-closure-library-0.0-20150902-b129bb9e.jar google-closure-library-third-party-0.0-20150902-b129bb9e.jar -->
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index f7878c0..f27b501 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -36,6 +36,19 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Class-Path>external/closure-compiler-v20181210.jar compiler-common.jar external/antlr-2.7.7.jar external/antlr-3.3.jar external/antlr-runtime-3.3.jar external/commons-cli-1.2.jar external/commons-io-2.4.jar external/guava-25.1-jre.jar external/lzma-sdk-4j-9.22.0.jar external/flex-tool-api-1.0.0.jar ..</Class-Path>
+ <!-- <Class-Path>compiler-common.jar external/antlr.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk.jar external/flex-tool-api.jar ..</Class-Path> -->
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 7d57e22..b797fa5 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -108,7 +108,7 @@ Do all the JBurg code generation.
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler</artifactId>
- <version>v20151015</version>
+ <version>v20181210</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
diff --git a/pom.xml b/pom.xml
index 126fdf8..828fa98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,7 +447,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <!-- <addClasspath>true</addClasspath> -->
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
<plugin>