build.xml
| @@ -68,8 +68,8 @@ |
| <zipfileset src="lib/csip-jersey-2.16/jettison-1.3.3.jar"/> |
| <zipfileset src="lib/csip-jersey-2.16/json-org.jar"/> |
| <zipfileset src="lib/csip-jersey-2.16/jsonassert-1.2.2.jar"/> |
| - |
| </jar> |
| + <echo file="${dist.dir}/version.txt">csip-core.version=${hg.version.short}</echo> |
| </target> |
| |
| <!-- |
jenkins-build.xml
| @@ -55,11 +55,14 @@ |
| |
| <target name="-create-versioned-war"> |
| <basename property="war.base" file="${dist.war}" suffix=".war"/> |
| - <move file="${dist.war}" tofile="${dist.dir}/${war.base}##${hg.version.short}.war"/> |
| - <echo file="${dist.dir}/version.txt">${hg.version.short}</echo> |
| - <echo>Created: ${war.base}##${hg.version.short}.war</echo> |
| + <property file="../csip-core/dist/version.txt"/> |
| + <property name="csip-core.version">0.0.0</property> |
| + <property name="suffix">${hg.version.short}-${csip-core.version}</property> |
| + <move file="${dist.war}" tofile="${dist.dir}/${war.base}##${suffix}.war"/> |
| + <echo file="${dist.dir}/version.txt">${suffix}</echo> |
| + <echo>Created: ${war.base}##${suffix}.war</echo> |
| </target> |
| - |
| + |
| <target name="-post-dist"> |
| <antcall target="-create-versioned-war"/> |
| </target> |
src/csip/Config.java
| @@ -105,7 +105,7 @@ |
| /* |
| The CSIP version |
| */ |
| - put("csip.version", "$version: 2.1.16 7a86841f0017 2016-04-04 od, built at 2016-04-04 14:19 by od$"); |
| + put("csip.version", "$version: 2.1.18 eb62ecc0fa3a 2016-04-04 od, built at 2016-04-05 09:59 by od$"); |
| |
| /* |
| * The runtime architecture. |