removing activemq-version pom variable and using project.version directly

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389803 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2012-09-25 11:12:45 +00:00
parent d9c73363a9
commit 5aed30d5df
2 changed files with 24 additions and 25 deletions

View File

@ -1193,7 +1193,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-generator</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

47
pom.xml
View File

@ -31,9 +31,8 @@
<inceptionYear>2005</inceptionYear>
<properties>
<activemq-version>${project.version}</activemq-version>
<activeio-version>3.1.4</activeio-version>
<siteId>activemq-${activemq-version}</siteId>
<siteId>activemq-${project.version}</siteId>
<projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
@ -179,7 +178,7 @@
<!-- this needs to match a server in your settings.xml with upload settings -->
<id>activemq-website</id>
<!-- set the staging.siteURL in your ~/.m2/settings.xml in a release or other profile -->
<url>${staging.siteURL}/maven/${activemq-version}</url>
<url>${staging.siteURL}/maven/${project.version}</url>
<!--<url>${site-repo-url}</url>-->
</site>
<snapshotRepository>
@ -229,98 +228,98 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-xmpp</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web-demo</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web-console</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-fileserver</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-rar</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-run</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
@ -339,17 +338,17 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-generator</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-karaf</artifactId>
<version>${activemq-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq.protobuf</groupId>