You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/05/06 15:09:17 UTC
svn commit: r941712 - in /activemq/trunk: ./ activemq-all/ activemq-camel/
activemq-console/ activemq-core/ activemq-fileserver/ activemq-optional/
activemq-pool/ activemq-ra/ activemq-rar/ activemq-run/ activemq-spring/
activemq-web-console/ activemq-...
Author: gtully
Date: Thu May 6 13:09:16 2010
New Revision: 941712
URL: http://svn.apache.org/viewvc?rev=941712&view=rev
Log:
some maven future proofing - resolve warn about pom property references
Modified:
activemq/trunk/activemq-all/pom.xml
activemq/trunk/activemq-camel/pom.xml
activemq/trunk/activemq-console/pom.xml
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-fileserver/pom.xml
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/activemq-pool/pom.xml
activemq/trunk/activemq-ra/pom.xml
activemq/trunk/activemq-rar/pom.xml
activemq/trunk/activemq-run/pom.xml
activemq/trunk/activemq-spring/pom.xml
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web-demo/pom.xml
activemq/trunk/activemq-web/pom.xml
activemq/trunk/activemq-xmpp/pom.xml
activemq/trunk/assembly/pom.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Thu May 6 13:09:16 2010
@@ -34,19 +34,19 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>kahadb</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Thu May 6 13:09:16 2010
@@ -68,13 +68,13 @@
<artifactId>camel-jms</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<!-- TODO we could maybe remove this dependency and use the Spring pool implementation? -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-pool</artifactId>
</dependency>
<dependency>
@@ -85,7 +85,7 @@
<!-- testing helpers -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-console/pom.xml (original)
+++ activemq/trunk/activemq-console/pom.xml Thu May 6 13:09:16 2010
@@ -62,16 +62,16 @@
<dependencies>
<!-- activemq related dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu May 6 13:09:16 2010
@@ -71,7 +71,7 @@
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
<optional>false</optional>
</dependency>
@@ -213,7 +213,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
<optional>false</optional>
<type>test-jar</type>
Modified: activemq/trunk/activemq-fileserver/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/pom.xml (original)
+++ activemq/trunk/activemq-fileserver/pom.xml Thu May 6 13:09:16 2010
@@ -79,7 +79,7 @@
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Thu May 6 13:09:16 2010
@@ -49,20 +49,20 @@
<dependencies>
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
Modified: activemq/trunk/activemq-pool/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/pom.xml (original)
+++ activemq/trunk/activemq-pool/pom.xml Thu May 6 13:09:16 2010
@@ -52,11 +52,11 @@
<artifactId>commons-logging-api</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<optional>true</optional>
</dependency>
@@ -79,7 +79,7 @@
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/pom.xml (original)
+++ activemq/trunk/activemq-ra/pom.xml Thu May 6 13:09:16 2010
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Thu May 6 13:09:16 2010
@@ -34,7 +34,7 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<exclusions>
<exclusion>
@@ -78,7 +78,7 @@
<artifactId>axion</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
</exclusion>
<exclusion>
Modified: activemq/trunk/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-run/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-run/pom.xml (original)
+++ activemq/trunk/activemq-run/pom.xml Thu May 6 13:09:16 2010
@@ -33,7 +33,7 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
</dependencies>
Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Thu May 6 13:09:16 2010
@@ -53,11 +53,11 @@
<artifactId>commons-logging-api</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-pool</artifactId>
</dependency>
<dependency>
@@ -83,7 +83,7 @@
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Thu May 6 13:09:16 2010
@@ -158,29 +158,29 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
</dependency>
<!-- XMPP support -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-xmpp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- TODO this should not be needed, but transitive dependencies are not working -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Thu May 6 13:09:16 2010
@@ -71,17 +71,17 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
</dependency>
<!-- TODO this should not be needed, but transitive dependencies are not working -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<scope>test</scope>
<type>test-jar</type>
Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Thu May 6 13:09:16 2010
@@ -33,15 +33,15 @@
<dependencies>
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<scope>test</scope>
<type>test-jar</type>
Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Thu May 6 13:09:16 2010
@@ -59,11 +59,11 @@
<dependencies>
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Thu May 6 13:09:16 2010
@@ -43,77 +43,77 @@
<!-- activemq -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-all</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-fileserver</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-pool</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-xmpp</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web-demo</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web-console</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-rar</artifactId>
<type>rar</type>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-run</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>kahadb</artifactId>
</dependency>
@@ -364,7 +364,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <includeGroupIds>${pom.groupId}</includeGroupIds>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
<includeArtifactIds>activemq-console</includeArtifactIds>
<outputDirectory>target/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
@@ -402,7 +402,7 @@
<descriptors>
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
- <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+ <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
<!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</execution>
@@ -416,7 +416,7 @@
<descriptors>
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
</descriptors>
- <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+ <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
<!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</execution>
@@ -425,7 +425,7 @@
<!-- plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>maven-activemq-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<configuration>
<configFile>${basedir}/src/release/conf/activemq.xml</configFile>
<url>broker:(tcp://localhost:61616)?useJmx=false</url>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=941712&r1=941711&r2=941712&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu May 6 13:09:16 2010
@@ -94,7 +94,7 @@
<activemq.osgi.export.version>${project.version}</activemq.osgi.export.version>
<activemq.osgi.import>${activemq.osgi.import.pkg}</activemq.osgi.import>
<activemq.osgi.dynamic.import/>
- <activemq.osgi.symbolic.name>${groupId}.${artifactId}</activemq.osgi.symbolic.name>
+ <activemq.osgi.symbolic.name>${project.groupId}.${project.artifactId}</activemq.osgi.symbolic.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
@@ -737,7 +737,7 @@
<dependency>
<groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId>
- <version>1.3</version>
+ <version>${activesoap-version}</version>
</dependency>
<dependency>
@@ -1080,7 +1080,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
<Export-Package>${activemq.osgi.export}</Export-Package>
<Import-Package>${activemq.osgi.import}</Import-Package>
@@ -1124,6 +1124,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>