This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag maven-launchpad-plugin-2.0.10 in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit c6c90d74fac02d375f2cdb2d6841003ea6feb7b9 Author: Justin Edelson <[email protected]> AuthorDate: Sat Jul 3 02:15:29 2010 +0000 SLING-1586 - adding overwrite version on merge code git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@960149 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/maven/projectsupport/AbstractBundleListMojo.java | 6 +++--- .../sling/maven/projectsupport/bundlelist/BaseBundleList.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java index 0c2fe4c..a0c3897 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java @@ -252,10 +252,10 @@ public abstract class AbstractBundleListMojo extends AbstractMojo { } else { bundleList = new BundleList(); if (includeDefaultBundles) { - Artifact artifact = getArtifact(defaultBundleList.getGroupId(), defaultBundleList.getArtifactId(), + Artifact defBndListArtifact = getArtifact(defaultBundleList.getGroupId(), defaultBundleList.getArtifactId(), defaultBundleList.getVersion(), defaultBundleList.getType(), defaultBundleList.getClassifier()); - getLog().info("Using bundle list file from " + artifact.getFile().getAbsolutePath()); - bundleList = readBundleList(artifact.getFile()); + getLog().info("Using bundle list file from " + defBndListArtifact.getFile().getAbsolutePath()); + bundleList = readBundleList(defBndListArtifact.getFile()); } if (bundleListFile.exists()) { diff --git a/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java b/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java index 97b185a..5bfc19f 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java @@ -78,7 +78,7 @@ public abstract class BaseBundleList { private void add(StartLevel mergeStartLevel, Bundle newBnd) { Bundle current = get(newBnd, false); if (current != null) { - + current.setVersion(newBnd.getVersion()); } else { StartLevel startLevel = null; if ( mergeStartLevel == null || newBnd.getStartLevel() > 0) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
