Attached is a patch to address the issues in DERBY-228: http://issues.jira.apache.org/jira/browse/DERBY-228

The MANIFEST.MF for derby.jar file has some support details for OSGI. However, there are some issues with it:
- the Bundle-version number does not change with each build.
- Import-Package does not need java.sql


Addressed by adding the svn revision number to the Bundle-Version, helping to assure that any bundle out in the wild with the same Bundle-Version will be identical code, and removing the Import-Package statement.

If there are no concerns, I would like to check this into the trunk and 10.0 branch.

andrew

Index: build.xml
===================================================================
--- build.xml (revision 161338)
+++ build.xml (working copy)
@@ -750,7 +750,7 @@
<manifest file="${derby.jar.dir}/lists/smf.mf">
<attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
<attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
- <attribute name="Bundle-Version" value="${major}.${minor}.${maint}"/>
+ <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
</manifest>


<jar destfile="${derby.jar.dir}/derby.jar"
@@ -768,8 +768,7 @@
<attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
<attribute name="Bundle-Activator" value="org.apache.derby.osgi.EmbeddedActivator"/>
<attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
- <attribute name="Bundle-Version" value="${major}.${minor}.${maint}"/>
- <attribute name="Import-Package" value="java.sql"/>
+ <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>




Reply via email to