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:30:44 UTC

[royale-asjs] branch develop updated: maven-distribution: fix classpaths on dummy jars. This should be improved to avoid hardcoded versions.

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-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new f590d51  maven-distribution: fix classpaths on dummy jars. This should be improved to avoid hardcoded versions.
f590d51 is described below

commit f590d51d6da615c5b33bd31a604c2883803d3986
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Jan 21 11:30:32 2020 +0100

    maven-distribution: fix classpaths on dummy jars. This should be improved to avoid hardcoded versions.
---
 distribution/jars/compiler-compjsc/pom.xml | 7 +++++--
 distribution/jars/compiler-mxmljsc/pom.xml | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/distribution/jars/compiler-compjsc/pom.xml b/distribution/jars/compiler-compjsc/pom.xml
index c720df1..ac9d678 100644
--- a/distribution/jars/compiler-compjsc/pom.xml
+++ b/distribution/jars/compiler-compjsc/pom.xml
@@ -38,11 +38,14 @@
         <configuration>
           <archive>
             <manifest>
-              <addClasspath>true</addClasspath>
+              <!-- <addClasspath>true</addClasspath>
               <classpathLayoutType>custom</classpathLayoutType>
-              <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+              <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> -->
               <mainClass>org.apache.royale.compiler.clients.COMPJSC</mainClass>
             </manifest>
+            <manifestEntries>
+              <Class-Path>compiler-jx-0.9.7-SNAPSHOT.jar</Class-Path>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-mxmljsc/pom.xml b/distribution/jars/compiler-mxmljsc/pom.xml
index c88792a..96f090a 100644
--- a/distribution/jars/compiler-mxmljsc/pom.xml
+++ b/distribution/jars/compiler-mxmljsc/pom.xml
@@ -38,11 +38,14 @@
         <configuration>
           <archive>
             <manifest>
-              <addClasspath>true</addClasspath>
+              <!-- <addClasspath>true</addClasspath>
               <classpathLayoutType>custom</classpathLayoutType>
-              <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+              <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> -->
               <mainClass>org.apache.royale.compiler.clients.MXMLJSC</mainClass>
             </manifest>
+            <manifestEntries>
+              <Class-Path>args4j.jar org.json.jar compiler-jx-0.9.7-SNAPSHOT.jar</Class-Path>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>