You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:16:34 UTC
[sling-maven-launchpad-plugin] 22/29: SLING-2386 : It should be
possible to remove bundles from an inherited partial bundle list. Apply
patch from Timo Naroska
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.2
in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit 023486f96e7f8d348685d3e25f0f1d120e186347
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 31 07:47:17 2012 +0000
SLING-2386 : It should be possible to remove bundles from an inherited partial bundle list. Apply patch from Timo Naroska
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1238220 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/projectsupport/AbstractUsingBundleListMojo.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
index 90dd76f..991f2be 100644
--- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
+++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
@@ -227,18 +227,14 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo
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 AbstractUsingBundleListMojo extends AbstractBundleListMojo
}
}
+ // handle exclusions
+ if (bundleExclusions != null) {
+ for (ArtifactDefinition def : bundleExclusions) {
+ initializedBundleList.remove(def.toBundle(), false);
+ }
+ }
initBundleList(initializedBundleList);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.