From 4e6a07bd5e976c08335ef454de8fcfdbdd01dad0 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 29 Sep 2013 17:15:39 +0000
Subject: 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
---
 qpid/java/common/build-generate-sources.xml | 1 +
 qpid/java/common/build.xml                  | 1 +
 qpid/java/common/pom.xml                    | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'qpid/java/common')

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>
-- 
cgit v1.2.1