flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - - Added support for pom-type dependencies
Date Mon, 04 Jul 2016 12:45:34 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop f67a685ae -> 9979f6736


- Added support for pom-type dependencies


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9979f673
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9979f673
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9979f673

Branch: refs/heads/develop
Commit: 9979f6736f0ec4135bac36e42017d278cae535e9
Parents: f67a685
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Mon Jul 4 14:45:27 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Mon Jul 4 14:45:27 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/flex/maven/flexjs/BaseMojo.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9979f673/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 c3737b1..e0aff34 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
@@ -271,8 +271,11 @@ public abstract class BaseMojo
     protected List<Artifact> getExternalLibraries(List<Artifact> artifacts) {
         List<Artifact> externalLibraries = new LinkedList<Artifact>();
         for(Artifact artifact : artifacts) {
-            if(("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
&& includeLibrary(artifact)) {
-                externalLibraries.add(artifact);
+            if(("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
+                    && includeLibrary(artifact)) {
+                if(!"pom".equals(artifact.getType())) {
+                    externalLibraries.add(artifact);
+                }
             }
         }
         if(isForceSwcExternalLibraryPath()) {
@@ -288,8 +291,11 @@ public abstract class BaseMojo
     private List<Artifact> internalGetLibraries(List<Artifact> artifacts) {
         List<Artifact> libraries = new LinkedList<Artifact>();
         for (Artifact artifact : artifacts) {
-            if (!("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
&& includeLibrary(artifact)) {
-                libraries.add(artifact);
+            if (!("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
+                    && includeLibrary(artifact)) {
+                if(!"pom".equals(artifact.getType())) {
+                    libraries.add(artifact);
+                }
             }
         }
         return libraries;


Mime
View raw message