svn commit: r706823 - in /tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin: BundleUtil.java ThirdPartyBundleDistroMojo.java

[rfeng]

Author: rfeng
Date: Tue Oct 21 17:44:24 2008
New Revision: 706823

URL: http://svn.apache.org/viewvc?rev=706823&view=rev
Log:
Adjust the calculation of version

Modified:
    
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
    
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleDistroMojo.java

Modified: 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java?rev=706823&r1=706822&r2=706823&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
 (original)
+++ 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
 Tue Oct 21 17:44:24 2008
@@ -365,7 +365,7 @@
      * @param jarFile
      * @return
      */
-    private static String version(String jarFile) {
+    static String version(String jarFile) {
         String version = "1.0.0";
         boolean found = false;
         Matcher matcher = pattern2.matcher(jarFile);

Modified: 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleDistroMojo.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleDistroMojo.java?rev=706823&r1=706822&r2=706823&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleDistroMojo.java
 (original)
+++ 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleDistroMojo.java
 Tue Oct 21 17:44:24 2008
@@ -104,10 +104,7 @@
                     ids.add(bundleName);
                 } else {
                     log.info("Adding third party jar: " + artifact);
-                    String version = artifact.getVersion();
-                    if (version.endsWith(Artifact.SNAPSHOT_VERSION)) {
-                        version = version.substring(0, version.length() - 
Artifact.SNAPSHOT_VERSION.length() - 1);
-                    }
+                    String version = 
BundleUtil.version(artifactFile.getPath());
 
                     Set<File> jarFiles = new HashSet<File>();
                     jarFiles.add(artifactFile);