Repository: flex-falcon Updated Branches: refs/heads/develop ccdfe3718 -> a323822f3
- Refactorred "external" scope to "provided" and "runtime" in order to resolve some transitive dependency problems Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a323822f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a323822f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a323822f Branch: refs/heads/develop Commit: a323822f33eb57d5a70a0ac08b53909c427db26b Parents: ccdfe37 Author: Christofer Dutz <[email protected]> Authored: Thu Jun 30 14:27:56 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Thu Jun 30 14:27:56 2016 +0200 ---------------------------------------------------------------------- externs/GCL/pom.xml | 2 +- externs/cordova/pom.xml | 2 +- externs/createjs/pom.xml | 2 +- externs/google_maps/pom.xml | 2 +- externs/jasmine/pom.xml | 2 +- externs/jquery/pom.xml | 2 +- externs/node/pom.xml | 2 +- .../org/apache/flex/maven/flexjs/BaseMojo.java | 8 ++--- .../resources/META-INF/plexus/components.xml | 35 ++++++++++++++++++++ 9 files changed, 44 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/GCL/pom.xml ---------------------------------------------------------------------- diff --git a/externs/GCL/pom.xml b/externs/GCL/pom.xml index 10be101..99f0a75 100644 --- a/externs/GCL/pom.xml +++ b/externs/GCL/pom.xml @@ -63,7 +63,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/cordova/pom.xml ---------------------------------------------------------------------- diff --git a/externs/cordova/pom.xml b/externs/cordova/pom.xml index 96cf081..259a6cb 100644 --- a/externs/cordova/pom.xml +++ b/externs/cordova/pom.xml @@ -80,7 +80,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/createjs/pom.xml ---------------------------------------------------------------------- diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml index 73cbbdc..ceb2c0c 100644 --- a/externs/createjs/pom.xml +++ b/externs/createjs/pom.xml @@ -332,7 +332,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/google_maps/pom.xml ---------------------------------------------------------------------- diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml index 4ebb579..cddf712 100644 --- a/externs/google_maps/pom.xml +++ b/externs/google_maps/pom.xml @@ -130,7 +130,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/jasmine/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml index a1a40a0..ec3213b 100644 --- a/externs/jasmine/pom.xml +++ b/externs/jasmine/pom.xml @@ -114,7 +114,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/jquery/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml index ced64e5..d185296 100644 --- a/externs/jquery/pom.xml +++ b/externs/jquery/pom.xml @@ -193,7 +193,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/externs/node/pom.xml ---------------------------------------------------------------------- diff --git a/externs/node/pom.xml b/externs/node/pom.xml index 817b92a..437f1cf 100644 --- a/externs/node/pom.xml +++ b/externs/node/pom.xml @@ -228,7 +228,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java index 2548892..6af130c 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java @@ -161,10 +161,6 @@ public abstract class BaseMojo protected List<String> getCompilerArgs(File configFile) throws MojoExecutionException { List<String> args = new LinkedList<String>(); args.add("-load-config=" + configFile.getPath()); - // It seems we need to manually pass this as it is not picked up by the compiler from the config file --> - /*for(Define define : getDefines()) { - args.add("-define=" + define.getName() + "," + define.getValue()); - }*/ return args; } @@ -223,7 +219,7 @@ public abstract class BaseMojo protected List<Artifact> getLibraries(List<Artifact> artifacts) { List<Artifact> libraries = new LinkedList<Artifact>(); for(Artifact artifact : artifacts) { - if(!"external".equalsIgnoreCase(artifact.getScope()) && includeLibrary(artifact)) { + if(!("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope())) && includeLibrary(artifact)) { libraries.add(artifact); } } @@ -233,7 +229,7 @@ public abstract class BaseMojo protected List<Artifact> getExternalLibraries(List<Artifact> artifacts) { List<Artifact> externalLibraries = new LinkedList<Artifact>(); for(Artifact artifact : artifacts) { - if("external".equalsIgnoreCase(artifact.getScope()) && includeLibrary(artifact)) { + if(("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope())) && includeLibrary(artifact)) { externalLibraries.add(artifact); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a323822f/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml index b27f82f..e732c38 100644 --- a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -145,5 +145,40 @@ <addedToClasspath>true</addedToClasspath> </configuration> </component> + <component> + <role>org.apache.maven.artifact.handler.ArtifactHandler</role> + <role-hint>js</role-hint> + <implementation> + org.apache.maven.artifact.handler.DefaultArtifactHandler + </implementation> + <configuration> + <type>js</type> + <extension>js</extension> + <language>flex</language> + <addedToClasspath>true</addedToClasspath> + </configuration> + </component> + <component> + <role>org.apache.maven.artifact.handler.ArtifactHandler</role> + <role-hint>jswc</role-hint> + <implementation> + org.apache.maven.artifact.handler.DefaultArtifactHandler + </implementation> + <configuration> + <type>jswc</type> + <extension>jswc</extension> + <language>flex</language> + <addedToClasspath>true</addedToClasspath> + </configuration> + </component> + <!-- Add other artifact handlers for different types of libraries --> + + <!-- + + FlexMojosCompatibleModelValidator: + https://github.com/doublefx/flexmojos-compatible-model-validator/blob/master/src/main/java/com/doublefx/maven/utils/flexmojos/mavenValidator/FlexMojosCompatibleModelValidator.java + + + --> </components> </component-set> \ No newline at end of file
