diff options
author | Robert Gemmell <robbie@apache.org> | 2014-04-21 14:20:11 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2014-04-21 14:20:11 +0000 |
commit | 9f70e3f0d1304971bd92e81add63cf22d0657640 (patch) | |
tree | 30b336bd7ea5f80264417037dcb7c985772579fa /qpid | |
parent | 947d29b0e67b23f60f3c6a3888a468a5e24afdd4 (diff) | |
download | qpid-python-9f70e3f0d1304971bd92e81add63cf22d0657640.tar.gz |
QPID-5048: re-instate dependency versions after qpid parent pom removal of dependency management section.
Patch supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588885 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
28 files changed, 154 insertions, 10 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/pom.xml b/qpid/java/amqp-1-0-client-jms/pom.xml index 2ed4f36b30..62f9cead39 100644 --- a/qpid/java/amqp-1-0-client-jms/pom.xml +++ b/qpid/java/amqp-1-0-client-jms/pom.xml @@ -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> diff --git a/qpid/java/amqp-1-0-client-websocket/pom.xml b/qpid/java/amqp-1-0-client-websocket/pom.xml index 6c30565978..24c244239c 100644 --- a/qpid/java/amqp-1-0-client-websocket/pom.xml +++ b/qpid/java/amqp-1-0-client-websocket/pom.xml @@ -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> diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml index bd0757caf3..05b3699cdb 100644 --- a/qpid/java/bdbstore/jmx/pom.xml +++ b/qpid/java/bdbstore/jmx/pom.xml @@ -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> diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index 5d34559a46..8758669497 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -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> diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index fe718f9dac..14884fb7a0 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -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> diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index de08dca104..7b9c8efece 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -45,44 +45,52 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </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. --> diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml index 67fe9a3b3f..ae5f33cd53 100644 --- a/qpid/java/broker-plugins/access-control/pom.xml +++ b/qpid/java/broker-plugins/access-control/pom.xml @@ -44,6 +44,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>${log4j-version}</version> </dependency> <!-- test dependencies --> diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml index 575ddff828..925c732c5f 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml @@ -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 --> diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml index 6189201917..945b66b23a 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -40,6 +40,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>${log4j-version}</version> </dependency> <!-- test dependencies --> diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml index 50be96b5f8..8057af858e 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml @@ -46,6 +46,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>${log4j-version}</version> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml index 8fa8ff8ec9..b39a4db4af 100644 --- a/qpid/java/broker-plugins/derby-store/pom.xml +++ b/qpid/java/broker-plugins/derby-store/pom.xml @@ -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 --> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml index 95f7b23822..86f28e2af0 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml @@ -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> diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml index 7076b6ae50..6453cf53b5 100644 --- a/qpid/java/broker-plugins/jdbc-store/pom.xml +++ b/qpid/java/broker-plugins/jdbc-store/pom.xml @@ -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> diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index a2128d587a..c66bda224f 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -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> diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml index c253b4d75d..64d0db3cb2 100644 --- a/qpid/java/broker-plugins/management-jmx/pom.xml +++ b/qpid/java/broker-plugins/management-jmx/pom.xml @@ -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> diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml index c60945119d..48fc79becd 100644 --- a/qpid/java/broker-plugins/websocket/pom.xml +++ b/qpid/java/broker-plugins/websocket/pom.xml @@ -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> diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 6e1f575671..4106b88527 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -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> diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml index f0fbb7e045..5735be9928 100644 --- a/qpid/java/client/pom.xml +++ b/qpid/java/client/pom.xml @@ -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 --> diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index b71840be93..ecdc0cb1e0 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -40,6 +40,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <version>${slf4j-version}</version> </dependency> <!-- test dependencies --> diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index afa30096f9..34ab4ea87c 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -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> diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index c21e2d6c63..d30aa5ec7f 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -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> diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index 026b614d4b..daa95b91c2 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -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> diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index af5a3da81a..ea59239ebb 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -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> diff --git a/qpid/java/qpid-perftests-systests/pom.xml b/qpid/java/qpid-perftests-systests/pom.xml index 4c0a95823c..d163756748 100644 --- a/qpid/java/qpid-perftests-systests/pom.xml +++ b/qpid/java/qpid-perftests-systests/pom.xml @@ -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> diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml index e3633e4eb8..9a76362bc6 100644 --- a/qpid/java/qpid-systests-parent/pom.xml +++ b/qpid/java/qpid-systests-parent/pom.xml @@ -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> diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml index dfc6496fe9..bd1e244e3b 100644 --- a/qpid/java/qpid-test-utils/pom.xml +++ b/qpid/java/qpid-test-utils/pom.xml @@ -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> diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index cfbb0216f6..e81bded061 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -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> diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml index 547fc98cb5..fbeb363c74 100644 --- a/qpid/java/tools/pom.xml +++ b/qpid/java/tools/pom.xml @@ -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> |