You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/07/19 17:33:33 UTC
svn commit: r1504919 - in /activemq/trunk: activemq-all/pom.xml
activemq-osgi/pom.xml activemq-rar/pom.xml activemq-run/pom.xml pom.xml
Author: tabish
Date: Fri Jul 19 15:33:33 2013
New Revision: 1504919
URL: http://svn.apache.org/r1504919
Log:
update some plugin versions and ensure we use the property value in all child poms.
Modified:
activemq/trunk/activemq-all/pom.xml
activemq/trunk/activemq-osgi/pom.xml
activemq/trunk/activemq-rar/pom.xml
activemq/trunk/activemq-run/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=1504919&r1=1504918&r2=1504919&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Fri Jul 19 15:33:33 2013
@@ -164,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${maven-source-plugin-version}</version>
<configuration>
<attach>false</attach>
</configuration>
@@ -354,7 +354,7 @@
<optional>true</optional>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1504919&r1=1504918&r2=1504919&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Fri Jul 19 15:33:33 2013
@@ -32,33 +32,33 @@
<properties>
<activemq.osgi.import.pkg>
- !org.apache.commons.daemon,
- !org.apache.maven*,
- sun.misc*;resolution:=optional,
- sun.nio*;resolution:=optional,
- javax.jmdns*;resolution:=optional,
- javax.resource*;resolution:=optional,
- javax.servlet*;resolution:=optional,
- com.thoughtworks.xstream*;resolution:=optional,
- org.apache.activeio*;resolution:=optional,
- org.apache.camel*;resolution:=optional,
- org.apache.derby.jdbc*;resolution:=optional,
- org.apache.geronimo.transaction.manager*;resolution:=optional,
- org.apache.hadoop*;resolution:=optional,
- org.apache.http*;resolution:=optional,
- org.apache.xpath*;resolution:=optional,
- org.bouncycastle*;resolution:=optional,
- org.codehaus.jackson*;resolution:=optional,
- org.codehaus.jettison*;resolution:=optional,
- org.jasypt*;resolution:=optional,
- org.eclipse.jetty*;resolution:=optional,
+ !org.apache.commons.daemon,
+ !org.apache.maven*,
+ sun.misc*;resolution:=optional,
+ sun.nio*;resolution:=optional,
+ javax.jmdns*;resolution:=optional,
+ javax.resource*;resolution:=optional,
+ javax.servlet*;resolution:=optional,
+ com.thoughtworks.xstream*;resolution:=optional,
+ org.apache.activeio*;resolution:=optional,
+ org.apache.camel*;resolution:=optional,
+ org.apache.derby.jdbc*;resolution:=optional,
+ org.apache.geronimo.transaction.manager*;resolution:=optional,
+ org.apache.hadoop*;resolution:=optional,
+ org.apache.http*;resolution:=optional,
+ org.apache.xpath*;resolution:=optional,
+ org.bouncycastle*;resolution:=optional,
+ org.codehaus.jackson*;resolution:=optional,
+ org.codehaus.jettison*;resolution:=optional,
+ org.jasypt*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional,
org.apache.zookeeper;resolution:=optional,
org.linkedin*;resolution:=optional,
- org.springframework.jms*;version="[3,4]";resolution:=optional,
- org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
- org.springframework.transaction*;version="[3,4]";resolution:=optional,
- org.xmlpull*;resolution:=optional,
- scala*;resolution:=optional,
+ org.springframework.jms*;version="[3,4]";resolution:=optional,
+ org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
+ org.springframework.transaction*;version="[3,4]";resolution:=optional,
+ org.xmlpull*;resolution:=optional,
+ scala*;resolution:=optional,
org.springframework*;version="[3,4]";resolution:=optional,
org.apache.xbean.spring*;resolution:=optional,
javax.annotation*,
@@ -69,18 +69,18 @@
org.apache.commons.pool*;resolution:=optional,
org.apache.commons.net*;resolution:=optional,
com.sun.syndication*;resolution:=optional,
- *
+ *
</activemq.osgi.import.pkg>
<activemq.osgi.export>
org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first,
org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first,
</activemq.osgi.export>
- <activemq.osgi.private.pkg>
- org.fusesource*,
- org.apache.qpid*,
- com.google.common*,
- org.iq80*
- </activemq.osgi.private.pkg>
+ <activemq.osgi.private.pkg>
+ org.fusesource*,
+ org.apache.qpid*,
+ com.google.common*,
+ org.iq80*
+ </activemq.osgi.private.pkg>
<activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
<surefire.argLine>-Xmx512M</surefire.argLine>
</properties>
@@ -301,7 +301,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${maven-source-plugin-version}</version>
<configuration>
<attach>false</attach>
</configuration>
@@ -317,7 +317,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>apache-release</id>
@@ -492,7 +492,7 @@
<optional>true</optional>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -522,7 +522,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
</project>
Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=1504919&r1=1504918&r2=1504919&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Fri Jul 19 15:33:33 2013
@@ -397,7 +397,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${maven-source-plugin-version}</version>
<configuration>
<attach>false</attach>
</configuration>
Modified: activemq/trunk/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-run/pom.xml?rev=1504919&r1=1504918&r2=1504919&view=diff
==============================================================================
--- activemq/trunk/activemq-run/pom.xml (original)
+++ activemq/trunk/activemq-run/pom.xml Fri Jul 19 15:33:33 2013
@@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${maven-source-plugin-version}</version>
<configuration>
<attach>false</attach>
</configuration>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1504919&r1=1504918&r2=1504919&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jul 19 15:33:33 2013
@@ -78,7 +78,7 @@
<jmdns-version>3.4.1</jmdns-version>
<jsp-version>2.1.v20100127</jsp-version>
<jstl-version>1.1.2</jstl-version>
- <jettison-version>1.3.3</jettison-version>
+ <jettison-version>1.3.4</jettison-version>
<jmock-version>2.5.1</jmock-version>
<josql-version>1.5_5</josql-version>
<junit-version>4.11</junit-version>
@@ -121,7 +121,7 @@
<xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.4</xstream-version>
- <xbean-version>3.13</xbean-version>
+ <xbean-version>3.14</xbean-version>
<xerces-version>2.11.0</xerces-version>
<zookeeper-version>3.4.5</zookeeper-version>
@@ -158,7 +158,7 @@
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
<cobertura-maven-plugin-version>2.5.2</cobertura-maven-plugin-version>
<taglist-maven-plugin-version>2.4</taglist-maven-plugin-version>
- <build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version>
+ <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<apache-rat-plugin-version>0.8</apache-rat-plugin-version>
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<depends-maven-plugin-version>1.2</depends-maven-plugin-version>