diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-29 17:15:39 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-29 17:15:39 +0000 |
| commit | 4e6a07bd5e976c08335ef454de8fcfdbdd01dad0 (patch) | |
| tree | b3383effc0a3d38dd62e9e71e9df7e058d60665b /qpid/java/common | |
| parent | 44d4ac330b25a6542f75524bd9c0f902b48b8c34 (diff) | |
| download | qpid-python-4e6a07bd5e976c08335ef454de8fcfdbdd01dad0.tar.gz | |
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
Diffstat (limited to 'qpid/java/common')
| -rw-r--r-- | qpid/java/common/build-generate-sources.xml | 1 | ||||
| -rw-r--r-- | qpid/java/common/build.xml | 1 | ||||
| -rw-r--r-- | qpid/java/common/pom.xml | 2 |
3 files changed, 4 insertions, 0 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> |