svn commit: r960149 - in /sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport: AbstractBundleListMojo.java bundlelist/BaseBundleList.java

[justin]

Author: justin
Date: Sat Jul  3 02:15:29 2010
New Revision: 960149

URL: http://svn.apache.org/viewvc?rev=960149&view=rev
Log:
SLING-1586 - adding overwrite version on merge code

Modified:
    
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
    
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java?rev=960149&r1=960148&r2=960149&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
 Sat Jul  3 02:15:29 2010
@@ -252,10 +252,10 @@ public abstract class AbstractBundleList
         } 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()) {

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java?rev=960149&r1=960148&r2=960149&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
 Sat Jul  3 02:15:29 2010
@@ -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) {