You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/01/31 08:47:17 UTC
svn commit: r1238220 -
/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
Author: cziegeler
Date: Tue Jan 31 07:47:17 2012
New Revision: 1238220
URL: http://svn.apache.org/viewvc?rev=1238220&view=rev
Log:
SLING-2386 : It should be possible to remove bundles from an inherited partial bundle list. Apply patch from Timo Naroska
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java?rev=1238220&r1=1238219&r2=1238220&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java (original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java Tue Jan 31 07:47:17 2012
@@ -227,18 +227,14 @@ public abstract class AbstractUsingBundl
initializedBundleList.merge(readBundleList(bundleListFile));
}
}
+ // add additional bundles
if (additionalBundles != null) {
for (ArtifactDefinition def : additionalBundles) {
initializedBundleList.add(def.toBundle());
}
}
- if (bundleExclusions != null) {
- for (ArtifactDefinition def : bundleExclusions) {
- initializedBundleList.remove(def.toBundle(), false);
- }
- }
-
+ // check for partial bundle lists
final Set<Artifact> dependencies = project.getDependencyArtifacts();
for (Artifact artifact : dependencies) {
if (PARTIAL.equals(artifact.getType())) {
@@ -249,6 +245,12 @@ public abstract class AbstractUsingBundl
}
}
+ // handle exclusions
+ if (bundleExclusions != null) {
+ for (ArtifactDefinition def : bundleExclusions) {
+ initializedBundleList.remove(def.toBundle(), false);
+ }
+ }
initBundleList(initializedBundleList);