From 124d6367f60f0e34ea7cb98a1cf48a45b8699560 Mon Sep 17 00:00:00 2001 From: rsivaram Date: Tue, 2 Sep 2008 18:13:56 +0000 Subject: Modify import version for OSGi framework packages git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@691337 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'java/sca/tools') 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 +} -- cgit v1.2.3