Author: kwall
Date: Fri Feb 10 09:24:15 2017
New Revision: 1782442
URL: http://svn.apache.org/viewvc?rev=1782442&view=rev
Log:
QPID-7603: [Java Broker] Use Maven dependencyManagement to properly control
dependency versions even when POM nesting is deep
Modified:
qpid/java/trunk/bdbstore/pom.xml
qpid/java/trunk/bdbstore/systests/pom.xml
qpid/java/trunk/broker-core/pom.xml
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/pom.xml
qpid/java/trunk/broker-plugins/derby-store/pom.xml
qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml
qpid/java/trunk/broker-plugins/jdbc-store/pom.xml
qpid/java/trunk/broker-plugins/logging-logback/pom.xml
qpid/java/trunk/broker-plugins/management-http/pom.xml
qpid/java/trunk/broker-plugins/websocket/pom.xml
qpid/java/trunk/broker/pom.xml
qpid/java/trunk/joramtests/pom.xml
qpid/java/trunk/perftests/pom.xml
qpid/java/trunk/perftests/visualisation-jfc/pom.xml
qpid/java/trunk/pom.xml
qpid/java/trunk/qpid-perftests-systests/pom.xml
qpid/java/trunk/qpid-systests-parent/pom.xml
qpid/java/trunk/qpid-test-utils/pom.xml
qpid/java/trunk/systests/pom.xml
qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml
qpid/java/trunk/tck/pom.xml
qpid/java/trunk/tools/pom.xml
Modified: qpid/java/trunk/bdbstore/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/pom.xml (original)
+++ qpid/java/trunk/bdbstore/pom.xml Fri Feb 10 09:24:15 2017
@@ -52,7 +52,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${bdb-version}</version>
<scope>provided</scope>
</dependency>
@@ -82,14 +81,12 @@
<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>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: qpid/java/trunk/bdbstore/systests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/pom.xml (original)
+++ qpid/java/trunk/bdbstore/systests/pom.xml Fri Feb 10 09:24:15 2017
@@ -46,7 +46,6 @@
<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>
@@ -59,7 +58,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${bdb-version}</version>
<scope>provided</scope>
</dependency>
Modified: qpid/java/trunk/broker-core/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/pom.xml (original)
+++ qpid/java/trunk/broker-core/pom.xml Fri Feb 10 09:24:15 2017
@@ -47,25 +47,21 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml-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. -->
@@ -78,7 +74,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-version}</version>
</dependency>
<!-- test dependencies -->
@@ -92,7 +87,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet-version}</version>
<scope>test</scope>
</dependency>
@@ -100,19 +94,12 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
@@ -272,12 +259,10 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
- <version>${velocity-version}</version>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
- <version>${velocity-version}</version>
</dependency>
</dependencies>
</plugin>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/pom.xml Fri Feb 10
09:24:15 2017
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/java/trunk/broker-plugins/derby-store/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/derby-store/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/derby-store/pom.xml Fri Feb 10 09:24:15 2017
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml Fri Feb 10
09:24:15 2017
@@ -47,7 +47,6 @@
<dependency>
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
- <version>${bonecp-version}</version>
<exclusions>
<exclusion>
<!-- exclude and specify a fixed version below -->
@@ -60,7 +59,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-version}</version>
<scope>runtime</scope>
</dependency>
Modified: qpid/java/trunk/broker-plugins/jdbc-store/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/pom.xml Fri Feb 10 09:24:15 2017
@@ -63,7 +63,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: qpid/java/trunk/broker-plugins/logging-logback/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/pom.xml Fri Feb 10 09:24:15
2017
@@ -47,7 +47,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<!-- test dependencies -->
Modified: qpid/java/trunk/broker-plugins/management-http/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/management-http/pom.xml Fri Feb 10 09:24:15
2017
@@ -53,37 +53,26 @@
<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>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
@@ -95,13 +84,11 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
Modified: qpid/java/trunk/broker-plugins/websocket/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/websocket/pom.xml Fri Feb 10 09:24:15 2017
@@ -48,25 +48,16 @@
<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>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>${jetty-version}</version>
</dependency>
</dependencies>
Modified: qpid/java/trunk/broker/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/broker/pom.xml (original)
+++ qpid/java/trunk/broker/pom.xml Fri Feb 10 09:24:15 2017
@@ -42,7 +42,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
@@ -54,7 +53,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${commons-cli-version}</version>
</dependency>
<dependency>
Modified: qpid/java/trunk/joramtests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/joramtests/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/joramtests/pom.xml (original)
+++ qpid/java/trunk/joramtests/pom.xml Fri Feb 10 09:24:15 2017
@@ -52,12 +52,10 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.joram-jms-tests</groupId>
@@ -67,7 +65,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
</dependency>
</dependencies>
@@ -175,7 +172,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
</dependencies>
</profile>
@@ -261,7 +257,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
</dependency>
</dependencies>
</profile>
@@ -284,7 +279,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
</dependencies>
</profile>
@@ -307,7 +301,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
</dependencies>
</profile>
Modified: qpid/java/trunk/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Fri Feb 10 09:24:15 2017
@@ -70,38 +70,32 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
</dependency>
<!-- test deps -->
@@ -207,7 +201,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
</dependencies>
</profile>
@@ -349,7 +342,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
</dependency>
</dependencies>
</profile>
Modified: qpid/java/trunk/perftests/visualisation-jfc/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/visualisation-jfc/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/java/trunk/perftests/visualisation-jfc/pom.xml Fri Feb 10 09:24:15 2017
@@ -52,13 +52,11 @@
<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>provided</scope>
</dependency>
@@ -66,14 +64,12 @@
<dependency>
<groupId>net.sourceforge.csvjdbc</groupId>
<artifactId>csvjdbc</artifactId>
- <version>${csvjdbc-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>${jfreechart-version}</version>
<scope>provided</scope>
</dependency>
Modified: qpid/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Fri Feb 10 09:24:15 2017
@@ -115,6 +115,7 @@
<dollar.sign>$</dollar.sign>
<at.sign>@</at.sign>
+
<bdb-version>5.0.104</bdb-version>
<derby-version>10.11.1.1</derby-version>
<logback-version>1.1.3</logback-version>
@@ -126,17 +127,12 @@
<!-- dependency version numbers -->
<bonecp-version>0.7.1.RELEASE</bonecp-version>
<commons-cli-version>1.2</commons-cli-version>
- <commons-codec-version>1.9</commons-codec-version>
- <commons-collections-version>3.2.1</commons-collections-version>
- <commons-lang-version>2.6</commons-lang-version>
<geronimo-jms-1-1-version>1.1.1</geronimo-jms-1-1-version>
<geronimo-jms-2-0-version>1.0-alpha-2</geronimo-jms-2-0-version>
<geronimo-jta-version>1.1.1</geronimo-jta-version>
<geronimo-servlet-version>1.0</geronimo-servlet-version>
<geronimo-j2ee-connector-version>2.0.0</geronimo-j2ee-connector-version>
- <geronimo-ejb-version>1.0.1</geronimo-ejb-version>
- <geronimo-kernel-version>2.2.1</geronimo-kernel-version>
<bcel-version>5.2</bcel-version>
<velocity-version>1.4</velocity-version>
@@ -147,7 +143,6 @@
<!-- test dependency version numbers -->
<junit-version>4.11</junit-version>
<mockito-version>1.9.5</mockito-version>
- <hamcrest-version>1.3</hamcrest-version>
<httpclient-version>4.4</httpclient-version>
<qpid-jms-client-version>0.11.0</qpid-jms-client-version>
<qpid-jms-client-ampq-0-x-version>6.1.1</qpid-jms-client-ampq-0-x-version>
@@ -166,7 +161,7 @@
<qpid.legacy.jms.client.groupid>org.apache.qpid</qpid.legacy.jms.client.groupid>
<qpid.legacy.jms.client.artifactid>qpid-client</qpid.legacy.jms.client.artifactid>
-
<qpid.legacy.jms.client.version>${project.version}</qpid.legacy.jms.client.version>
+
<qpid.legacy.jms.client.version>${qpid-jms-client-ampq-0-x-version}</qpid.legacy.jms.client.version>
<qpid.legacy.jms.client.type>jar</qpid.legacy.jms.client.type>
</properties>
@@ -227,6 +222,147 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${qpid-jms-client-ampq-0-x-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jca</artifactId>
+ <version>${qpid-jms-client-ampq-0-x-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>${qpid-jms-client-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sleepycat</groupId>
+ <artifactId>je</artifactId>
+ <version>${bdb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml-jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml-jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ <version>${bonecp-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <version>${geronimo-jms-2-0-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo-jta-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.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo-j2ee-connector-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>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-websocket</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>${bcel-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
+ <version>${velocity-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.csvjdbc</groupId>
+ <artifactId>csvjdbc</artifactId>
+ <version>${csvjdbc-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>${jfreechart-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient-version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
Modified: qpid/java/trunk/qpid-perftests-systests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/pom.xml (original)
+++ qpid/java/trunk/qpid-perftests-systests/pom.xml Fri Feb 10 09:24:15 2017
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby-version}</version>
<scope>runtime</scope>
</dependency>
@@ -73,7 +72,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${bdb-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: qpid/java/trunk/qpid-systests-parent/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Fri Feb 10 09:24:15 2017
@@ -59,13 +59,11 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
</dependencies>
@@ -246,7 +244,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
</dependency>
</dependencies>
</profile>
@@ -262,7 +259,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
</dependencies>
</profile>
Modified: qpid/java/trunk/qpid-test-utils/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/qpid-test-utils/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/qpid-test-utils/pom.xml (original)
+++ qpid/java/trunk/qpid-test-utils/pom.xml Fri Feb 10 09:24:15 2017
@@ -38,19 +38,16 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-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>
Modified: qpid/java/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/systests/pom.xml (original)
+++ qpid/java/trunk/systests/pom.xml Fri Feb 10 09:24:15 2017
@@ -41,26 +41,22 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
<!-- jca deps -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jca</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
<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>
@@ -167,7 +163,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${bdb-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml (original)
+++ qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml Fri Feb 10 09:24:15
2017
@@ -64,7 +64,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>${bdb-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -74,7 +73,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -85,7 +83,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
- <version>${geronimo-jms-2-0-version}</version>
</dependency>
</dependencies>
Modified: qpid/java/trunk/tck/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tck/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/tck/pom.xml (original)
+++ qpid/java/trunk/tck/pom.xml Fri Feb 10 09:24:15 2017
@@ -55,27 +55,22 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
</dependencies>
@@ -156,7 +151,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
</dependency>
<dependency>
<groupId>oracle-jms-tck2</groupId>
@@ -546,7 +540,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
</dependencies>
</profile>
@@ -645,7 +638,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid-jms-client-version}</version>
</dependency>
</dependencies>
</profile>
Modified: qpid/java/trunk/tools/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tools/pom.xml?rev=1782442&r1=1782441&r2=1782442&view=diff
==============================================================================
--- qpid/java/trunk/tools/pom.xml (original)
+++ qpid/java/trunk/tools/pom.xml Fri Feb 10 09:24:15 2017
@@ -32,31 +32,26 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml-jackson-version}</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
