Repository: activemq-6 Updated Branches: refs/heads/master 8de3b4007 -> 2e1d5021f
Remove duplicate deps from poms Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8603eca3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8603eca3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8603eca3 Branch: refs/heads/master Commit: 8603eca3364fd38742d6986788e46b04f21e0857 Parents: 5a0ff8f Author: Martyn Taylor <[email protected]> Authored: Mon Mar 9 16:24:40 2015 +0000 Committer: Martyn Taylor <[email protected]> Committed: Mon Mar 9 16:29:57 2015 +0000 ---------------------------------------------------------------------- activemq-jms-server/pom.xml | 5 ----- activemq-web/pom.xml | 7 ------- pom.xml | 1 + tests/integration-tests/pom.xml | 10 ---------- 4 files changed, 1 insertion(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8603eca3/activemq-jms-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml index bbd7475..475e9ce 100644 --- a/activemq-jms-server/pom.xml +++ b/activemq-jms-server/pom.xml @@ -69,11 +69,6 @@ <artifactId>geronimo-jta_1.1_spec</artifactId> <version>1.1.1</version> </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-service-extensions</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8603eca3/activemq-web/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index 53b3166..c675bf7 100644 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -57,13 +57,6 @@ <scope>test</scope> </dependency> - - <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <scope>test</scope> - </dependency> - <!-- this is for the log assertion --> <dependency> <groupId>org.apache.activemq</groupId> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8603eca3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2d11a24..31f6604 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>16</version> + <relativePath>org.apache:apache</relativePath> </parent> <modules> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8603eca3/tests/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index 93b8f97..3c32bfe 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -223,16 +223,6 @@ <version>1.0.1</version> <scope>test</scope> </dependency> - - <!-- this is for the log assertion --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-commons</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - </dependencies> <build>
