summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-11-25 23:45:12 +0000
committerRobert Gemmell <robbie@apache.org>2012-11-25 23:45:12 +0000
commit33e3ebd7c6b63c6506afc998db9229716e96ee4f (patch)
tree684a300a02fccfa54998ff16b89835e00b68e201 /java
parent3c29f0422fca5898ccea52415b126d07fd10cf44 (diff)
downloadqpid-python-33e3ebd7c6b63c6506afc998db9229716e96ee4f.tar.gz
QPID-4467, QPID-4431: base the maven output on the next release version (even) rather than the development version (odd) number so the snapshots versions are meaningful
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1413445 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/common.xml3
-rw-r--r--java/module.xml2
2 files changed, 4 insertions, 1 deletions
diff --git a/java/common.xml b/java/common.xml
index 2360dcddb7..8a4e0b81a7 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -23,7 +23,10 @@
<dirname property="project.root" file="${ant.file.common}"/>
<property name="project.name" value="qpid"/>
+ <!-- Version used for standard build output -->
<property name="project.version" value="0.21"/>
+ <!-- The release version used for maven output. SNAPSHOT added via maven.version.suffix -->
+ <property name="project.version.maven" value="0.22"/>
<property name="project.url" value="http://qpid.apache.org"/>
<property name="project.groupid" value="org.apache.qpid"/>
<property name="project.namever" value="${project.name}-${project.version}"/>
diff --git a/java/module.xml b/java/module.xml
index 26349fb41c..695e358d7a 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -257,7 +257,7 @@
<arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
<arg line="-u ${project.url}"/>
<arg line="-g ${project.groupid}"/>
- <arg line="-v ${project.version}${maven.version.suffix}"/>
+ <arg line="-v ${project.version.maven}${maven.version.suffix}"/>
<arg line="-p qpid"/>
<arg line='-m "${module.depends}"'/>
<arg line="-a ${module.name}"/>