build up version using $buildQualifer vs expecting full version to be parsed in by cli
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@830187 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/build.properties b/sigil/bldcommon/build.properties
index ef17fae..404b1b7 100644
--- a/sigil/bldcommon/build.properties
+++ b/sigil/bldcommon/build.properties
@@ -1,6 +1,10 @@
# common properties
# easier to set here than in xml file
+buildRelease = 0.9.0
+buildQualifier = SNAPSHOT
+buildVersion = ${buildRelease}.${buildQualifier}
+
# set common.dir when used without ant (e.g. IvyDE)
common.dir = ${ivy.settings.dir}
@@ -35,8 +39,5 @@
resolve.log = download-only
-# over-ridden by hudson
-buildVersion = 0.9.0.SNAPSHOT
-
# end
diff --git a/sigil/bldcommon/common.xml b/sigil/bldcommon/common.xml
index a44994a..f260933 100644
--- a/sigil/bldcommon/common.xml
+++ b/sigil/bldcommon/common.xml
@@ -22,11 +22,8 @@
xmlns:groovy="antlib:org.codehaus.groovy">
<dirname property="common.dir" file="${ant.file.bldcommon}"/>
- <property file="${common.dir}/sigil-defaults.properties" prefix="default."/>
<property file="${common.dir}/build.properties"/>
- <echo>cache=${cache.dir}</echo>
- <echo>buildVersion=${buildVersion}</echo>
<!-- =====================================================
stuff intended to be over-ridden is prefixed with my.
=====================================================-->