You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/29 19:15:40 UTC
svn commit: r1527351 - in /qpid/trunk/qpid/java:
common/build-generate-sources.xml common/build.xml common/pom.xml module.xml
Author: robbie
Date: Sun Sep 29 17:15:39 2013
New Revision: 1527351
URL: http://svn.apache.org/r1527351
Log:
QPID-5158: remove old/duplicate create-version target, fix version.file property location
Modified:
qpid/trunk/qpid/java/common/build-generate-sources.xml
qpid/trunk/qpid/java/common/build.xml
qpid/trunk/qpid/java/common/pom.xml
qpid/trunk/qpid/java/module.xml
Modified: qpid/trunk/qpid/java/common/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build-generate-sources.xml?rev=1527351&r1=1527350&r2=1527351&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build-generate-sources.xml (original)
+++ qpid/trunk/qpid/java/common/build-generate-sources.xml Sun Sep 29 17:15:39 2013
@@ -27,6 +27,7 @@
<isset property="generated-amqp-0-8-dir"/>
<isset property="generated-amqp-0-10-dir"/>
<isset property="gentools.classes"/>
+ <isset property="version.file"/>
</and>
</not>
</condition>
Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1527351&r1=1527350&r2=1527351&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Sun Sep 29 17:15:39 2013
@@ -39,6 +39,7 @@
<property name="generated-amqp-0-8-dir" value="${module.precompiled}"/>
<property name="generated-amqp-0-10-dir" value="${module.precompiled}"/>
<property name="gentools.classes" value="${build.scratch}/common/gentools/classes"/>
+ <property name="version.file" location="${module.classes}/qpidversion.properties"/>
</ant>
</target>
Modified: qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/pom.xml?rev=1527351&r1=1527350&r2=1527351&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/pom.xml (original)
+++ qpid/trunk/qpid/java/common/pom.xml Sun Sep 29 17:15:39 2013
@@ -27,9 +27,11 @@
<artifactId>qpid-common</artifactId>
<properties>
+ <!-- used during the antrun-plugin execution -->
<generated-amqp-0-8-dir>${project.build.directory}/generated-sources/generated-amqp-0-8</generated-amqp-0-8-dir>
<generated-amqp-0-10-dir>${project.build.directory}/generated-sources/generated-amqp-0-10</generated-amqp-0-10-dir>
<selector.output.dir>${project.build.directory}/generated-sources/generated-jms-selector/org/apache/qpid/filter/selector</selector.output.dir>
+ <version.file>${project.build.directory}/classes/qpidversion.properties</version.file>
</properties>
<dependencies>
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1527351&r1=1527350&r2=1527351&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Sun Sep 29 17:15:39 2013
@@ -801,30 +801,6 @@
</cobertura-report>
</target>
- <property name="version.file" location="${module.classes}/qpidversion.properties"/>
- <property file="${version.file}" prefix="old."/>
-
- <target name="check-version">
- <exec executable="svnversion" spawn="false" failifexecutionfails="false"
- dir="${project.root}" outputproperty="svnversion.output">
- <arg line="."/>
- </exec>
- <condition property="version.stale">
- <not>
- <equals arg1="${svnversion.output}" arg2="${old.qpid.svnversion}"/>
- </not>
- </condition>
- </target>
-
- <target name="create-version" depends="check-version" if="version.stale">
- <!-- Write the version.properties out.-->
- <!-- Echos exactly as shown, so leave no spaces before/after lines -->
- <echo file="${version.file}" append="false">qpid.version=${project.version}
-qpid.svnversion=${svnversion.output}
-qpid.name=${project.name}
-</echo>
- </target>
-
<target name="eclipse" depends="eclipse-setup,eclipse-project,eclipse-source-only,eclipse-source-and-test"/>
<target name="eclipse-setup">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org