Repository: flex-falcon Updated Branches: refs/heads/develop cdad636c5 -> f6fc72abc
- Made the plugin filter out rb.swc dependencies till handling for these is implemented in the plugin Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f6fc72ab Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f6fc72ab Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f6fc72ab Branch: refs/heads/develop Commit: f6fc72abc90a3b3817428fb056f34b049e41ecf2 Parents: cdad636 Author: Christofer Dutz <[email protected]> Authored: Tue Jul 5 10:54:57 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue Jul 5 10:54:57 2016 +0200 ---------------------------------------------------------------------- .../org/apache/flex/maven/flexjs/BaseMojo.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f6fc72ab/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 e0aff34..9a3ccff 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 @@ -101,8 +101,9 @@ public abstract class BaseMojo List<Artifact> allLibraries = DependencyHelper.getAllLibraries( project, repositorySystemSession, projectDependenciesResolver); - List<Artifact> libraries = getLibraries(allLibraries); - List<Artifact> externalLibraries = getExternalLibraries(allLibraries); + List<Artifact> filteredLibraries = getFilteredLibraries(allLibraries); + List<Artifact> libraries = getLibraries(filteredLibraries); + List<Artifact> externalLibraries = getExternalLibraries(filteredLibraries); List<String> sourcePaths = getSourcePaths(); context.put("libraries", libraries); context.put("externalLibraries", externalLibraries); @@ -261,6 +262,19 @@ public abstract class BaseMojo } } + protected List<Artifact> getFilteredLibraries(List<Artifact> artifacts) { + List<Artifact> filteredLibraries = new LinkedList<Artifact>(); + if(artifacts != null) { + for(Artifact artifact : artifacts) { + // Strip out resource-bundles (for now). + if(!"rb.swc".equals(artifact.getType())) { + filteredLibraries.add(artifact); + } + } + } + return filteredLibraries; + } + protected List<Artifact> getLibraries(List<Artifact> artifacts) { if(!isForceSwcExternalLibraryPath()) { return internalGetLibraries(artifacts);
