Author: fuzzylogic
Date: Mon Apr 25 12:25:19 2005
New Revision: 164627
URL: http://svn.apache.org/viewcvs?rev=164627&view=rev
Log:
Derby-228: Address two issues with the Derby manifest file for OSGi support.
- the Bundle-version number should change with each build
- Import-Package does not need import java.sql
Modified:
incubator/derby/code/trunk/build.xml
Modified: incubator/derby/code/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/build.xml?rev=164627&r1=164626&r2=164627&view=diff
==============================================================================
--- incubator/derby/code/trunk/build.xml (original)
+++ incubator/derby/code/trunk/build.xml Mon Apr 25 12:25:19 2005
@@ -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}"/>
<attribute name="DynamicImport-Package" value="*"/>
<attribute name="Export-Package"
value="org.apache.derby.authentication,org.apache.derby.database,org.apache.derby.io,org.apache.derby.jdbc,org.apache.derby.vti"/>
</manifest>
