Modify import version for OSGi framework packages

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@691337 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 3 deletions

diff --git a/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java b/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
index 1f9902e2d6..79b0db4223 100644
--- a/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
+++ b/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
@@ -347,7 +347,7 @@ public class TuscanyBundlePluginMojo extends BundleAllPlugin {
         String artifactId = artifact.getGroupId() + ":" + artifact.getArtifactId();
         
         String bundleSymName = (String)attributes.getValue("Bundle-SymbolicName");
-        if (!bundleSymName.startsWith("org.apache.tuscany")) {
+        if (!bundleSymName.startsWith("org.apache.tuscany.sca")) {
             bundleSymName = "org.apache.tuscany.sca.3rdparty." + bundleSymName;
             attributes.putValue("Bundle-SymbolicName", bundleSymName);
             
@@ -376,7 +376,10 @@ public class TuscanyBundlePluginMojo extends BundleAllPlugin {
                 Map importAttr = (Map)importMap.get(pkg);
                 String version = (String)importAttr.get("version");
                 if (version != null && version.indexOf(',') == -1) {
-                    if (!version.matches(".*\\..*\\.")) {
+                    if (((String)pkg).startsWith("org.osgi")) {
+                        // Leave version as is - for OSGi packages, assume backward compatibility
+                    }
+                    else if (!version.matches(".*\\..*\\.")) {
                         Version curVersion = new Version(version);
                         Version nextVersion = new Version(curVersion.getMajor(), curVersion.getMinor()+1, 0);
                         version = '[' + version + ',' + nextVersion + ')';
@@ -499,4 +502,4 @@ public class TuscanyBundlePluginMojo extends BundleAllPlugin {
             }
         }
     }
-}
\ No newline at end of file
+}