You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/04/21 16:20:12 UTC
svn commit: r1588885 - in /qpid/trunk/qpid/java: ./ amqp-1-0-client-jms/
amqp-1-0-client-websocket/ bdbstore/ bdbstore/jmx/ bdbstore/systests/
broker-core/ broker-plugins/access-control/
broker-plugins/amqp-0-10-protocol/ broker-plugins/amqp-0-8-protoc...
Author: robbie
Date: Mon Apr 21 14:20:11 2014
New Revision: 1588885
URL: http://svn.apache.org/r1588885
Log:
QPID-5048: re-instate dependency versions after qpid parent pom removal of dependency management section.
Patch supplied by Andrew MacBean <an...@gmail.com>.
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml
qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
qpid/trunk/qpid/java/bdbstore/jmx/pom.xml
qpid/trunk/qpid/java/bdbstore/pom.xml
qpid/trunk/qpid/java/bdbstore/systests/pom.xml
qpid/trunk/qpid/java/broker-core/pom.xml
qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml
qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
qpid/trunk/qpid/java/broker/pom.xml
qpid/trunk/qpid/java/client/pom.xml
qpid/trunk/qpid/java/common/pom.xml
qpid/trunk/qpid/java/jca/pom.xml
qpid/trunk/qpid/java/perftests/pom.xml
qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
qpid/trunk/qpid/java/pom.xml
qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml
qpid/trunk/qpid/java/qpid-systests-parent/pom.xml
qpid/trunk/qpid/java/qpid-test-utils/pom.xml
qpid/trunk/qpid/java/systests/pom.xml
qpid/trunk/qpid/java/tools/pom.xml
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml Mon Apr 21 14:20:11 2014
@@ -48,6 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml Mon Apr 21 14:20:11 2014
@@ -48,11 +48,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>${geronimo-servlet-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
+ <version>${jetty-version}</version>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/bdbstore/jmx/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/pom.xml Mon Apr 21 14:20:11 2014
@@ -52,11 +52,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
<scope>provided</scope>
</dependency>
Modified: qpid/trunk/qpid/java/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/pom.xml Mon Apr 21 14:20:11 2014
@@ -45,11 +45,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
<scope>provided</scope>
</dependency>
@@ -79,6 +81,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>test</scope>
</dependency>
Modified: qpid/trunk/qpid/java/bdbstore/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/systests/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/systests/pom.xml Mon Apr 21 14:20:11 2014
@@ -47,6 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
@@ -65,6 +66,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
</dependency>
<dependency>
Modified: qpid/trunk/qpid/java/broker-core/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-core/pom.xml Mon Apr 21 14:20:11 2014
@@ -45,44 +45,52 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
+ <version>${bcel-version}</version>
<exclusions>
<exclusion>
<!-- Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. -->
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml Mon Apr 21 14:20:11 2014
@@ -44,6 +44,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,11 +40,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,6 +40,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml Mon Apr 21 14:20:11 2014
@@ -46,6 +46,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml Mon Apr 21 14:20:11 2014
@@ -39,11 +39,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,6 +40,7 @@
<dependency>
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
+ <version>${bonecp-version}</version>
<exclusions>
<exclusion>
<!-- exclude and specify a fixed version below -->
@@ -52,6 +53,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>${guava-version}</version>
<scope>runtime</scope>
</dependency>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,6 +40,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<!-- test dependencies -->
@@ -61,6 +62,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,21 +40,25 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>${geronimo-servlet-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -66,6 +70,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml Mon Apr 21 14:20:11 2014
@@ -46,6 +46,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<!-- test dependencies -->
@@ -59,6 +60,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-version}</version>
<scope>test</scope>
</dependency>
Modified: qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,11 +40,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>${geronimo-servlet-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -56,6 +58,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
+ <version>${jetty-version}</version>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/pom.xml (original)
+++ qpid/trunk/qpid/java/broker/pom.xml Mon Apr 21 14:20:11 2014
@@ -48,11 +48,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <version>${commons-cli-version}</version>
</dependency>
<dependency>
Modified: qpid/trunk/qpid/java/client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/pom.xml (original)
+++ qpid/trunk/qpid/java/client/pom.xml Mon Apr 21 14:20:11 2014
@@ -42,12 +42,14 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/pom.xml (original)
+++ qpid/trunk/qpid/java/common/pom.xml Mon Apr 21 14:20:11 2014
@@ -40,6 +40,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/trunk/qpid/java/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/pom.xml (original)
+++ qpid/trunk/qpid/java/jca/pom.xml Mon Apr 21 14:20:11 2014
@@ -39,41 +39,48 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo-j2ee-connector-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo-jta-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>${geronimo-ejb-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>${geronimo-servlet-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${geronimo-kernel-version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Modified: qpid/trunk/qpid/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/pom.xml Mon Apr 21 14:20:11 2014
@@ -39,33 +39,45 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
<!-- other deps -->
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <version>${commons-collections-version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <version>${gson-version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby-version}</version>
<scope>runtime</scope>
</dependency>
Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml Mon Apr 21 14:20:11 2014
@@ -39,11 +39,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby-version}</version>
<scope>runtime</scope>
</dependency>
Modified: qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Mon Apr 21 14:20:11 2014
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -132,6 +133,23 @@
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
@@ -169,7 +187,7 @@
</goals>
<configuration>
<target>
- <mkdir dir="${qpid.home.qbtc.output}"/>
+ <mkdir dir="${qpid.home.qbtc.output}" />
</target>
</configuration>
</execution>
@@ -291,6 +309,21 @@
</plugins>
</build>
+ <repositories>
+ <!-- For the BDB JE dependency of the optional bdbstore plugin modules-->
+ <repository>
+ <id>oracle.releases</id>
+ <url>http://download.oracle.com/maven</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<reporting>
<plugins>
<plugin>
@@ -591,7 +624,7 @@
<profile.broker.stopped>Exception constructed</profile.broker.stopped>
<profile.broker.ready>Listening on TCP</profile.broker.ready>
<profile.broker.command>${cpp-broker-dir}/qpidd -p @PORT --data-dir ${qpid.work}/@PORT -t --auth no --no-module-dir</profile.broker.command>
- <profile.broker.command.windows></profile.broker.command.windows>
+ <profile.broker.command.windows />
<profile.test.excludes>Excludes CPPExcludes ${profile}.excludes ${profile.specific.excludes} cpp.excludes</profile.test.excludes>
<profile.specific.excludes>CPPPrefetchExcludes CPPTransientExcludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
@@ -624,6 +657,30 @@
</build>
</profile>
+ <!-- Profile to update the Apache parent pom profile of the same name to prevent source assembly at java build level.-->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml (original)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml Mon Apr 21 14:20:11 2014
@@ -56,6 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
@@ -63,26 +64,31 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <version>${commons-collections-version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <version>${gson-version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby-version}</version>
<scope>runtime</scope>
</dependency>
@@ -97,6 +103,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: qpid/trunk/qpid/java/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-systests-parent/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-systests-parent/pom.xml (original)
+++ qpid/trunk/qpid/java/qpid-systests-parent/pom.xml Mon Apr 21 14:20:11 2014
@@ -62,11 +62,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
</dependencies>
@@ -199,6 +201,7 @@
<artifactItem>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
Modified: qpid/trunk/qpid/java/qpid-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-test-utils/pom.xml (original)
+++ qpid/trunk/qpid/java/qpid-test-utils/pom.xml Mon Apr 21 14:20:11 2014
@@ -38,21 +38,25 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: qpid/trunk/qpid/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/pom.xml (original)
+++ qpid/trunk/qpid/java/systests/pom.xml Mon Apr 21 14:20:11 2014
@@ -47,6 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
@@ -60,11 +61,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo-j2ee-connector-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo-jta-version}</version>
<scope>runtime</scope>
</dependency>
@@ -179,6 +182,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
+ <version>${bdb-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: qpid/trunk/qpid/java/tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/pom.xml?rev=1588885&r1=1588884&r2=1588885&view=diff
==============================================================================
--- qpid/trunk/qpid/java/tools/pom.xml (original)
+++ qpid/trunk/qpid/java/tools/pom.xml Mon Apr 21 14:20:11 2014
@@ -38,16 +38,20 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org