archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify import version for OSGi framework packages

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@691337 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
rsivaram 2008-09-02 18:13:56 +00:00
parent 886137371f
commit 124d6367f6
1 changed files with 6 additions and 3 deletions

9
java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
View file

@ -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 {
}
}
}
}
}