Author: hibou
Date: Mon Feb 2 09:04:49 2009
New Revision: 739947
URL: http://svn.apache.org/viewvc?rev=739947&view=rev
Log:
Make the bundle version following the OSGi spec
Modified:
ant/ivy/core/trunk/build.xml
ant/ivy/core/trunk/version.properties
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=739947&r1=739946&r2=739947&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Mon Feb 2 09:04:49 2009
@@ -172,7 +172,7 @@
</tstamp>
<property name="version.prefix" value="${target.ivy.version}-local-" />
<property name="build.version" value="${version.prefix}${pubdate}" />
- <property name="bundle.version"
value="${target.ivy.bundle.version}_${pubdate}" />
+ <property name="bundle.version"
value="${target.ivy.bundle.version}.${target.ivy.bundle.version.qualifier}${pubdate}"
/>
</target>
<!-- =================================================================
Modified: ant/ivy/core/trunk/version.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/version.properties?rev=739947&r1=739946&r2=739947&view=diff
==============================================================================
--- ant/ivy/core/trunk/version.properties (original)
+++ ant/ivy/core/trunk/version.properties Mon Feb 2 09:04:49 2009
@@ -17,4 +17,8 @@
# * under the License.
# ***************************************************************
target.ivy.version=2.1.x
-target.ivy.bundle.version=2.1.x
+# Following OSGi spec: have to be 3 numbers separated by dots
+target.ivy.bundle.version=2.1.0
+# in case we want to add a qualifier such as alpha, beta, etc...
+# if non empty, add a '_' at the end of the qualifier, so the version would
look like 1.2.3.alpha_200901011200
+target.ivy.bundle.version.qualifier=
