QPID-5158: remove old/duplicate create-version target, fix version.file property location

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527351 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 4 insertions, 24 deletions

diff --git a/qpid/java/common/build-generate-sources.xml b/qpid/java/common/build-generate-sources.xml
index 84717ca5a3..26adeb6ae7 100644
--- a/qpid/java/common/build-generate-sources.xml
+++ b/qpid/java/common/build-generate-sources.xml
@@ -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>
diff --git a/qpid/java/common/build.xml b/qpid/java/common/build.xml
index 1c409cfc4e..4b755cddd4 100644
--- a/qpid/java/common/build.xml
+++ b/qpid/java/common/build.xml
@@ -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>
 
diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index 0155482478..a5ab0cae05 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -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>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 3bd9f7381c..28c31f967d 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -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">