Repository: activemq Updated Branches: refs/heads/master e69367fbc -> 7cae60eae
[AMQ-6684] exclude json cat-x transitive dep Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/7cae60ea Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/7cae60ea Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/7cae60ea Branch: refs/heads/master Commit: 7cae60eae0e2835222783c770974d83323dd6a10 Parents: e69367f Author: gtully <gary.tu...@gmail.com> Authored: Wed May 24 16:19:09 2017 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Wed May 24 16:19:09 2017 +0100 ---------------------------------------------------------------------- activemq-http/pom.xml | 12 ++++++++++++ activemq-leveldb-store/pom.xml | 6 ++++++ activemq-partition/pom.xml | 6 ++++++ activemq-spring/pom.xml | 6 ++++++ assembly/pom.xml | 6 ++++++ 5 files changed, 36 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/7cae60ea/activemq-http/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index 7938758..3812a81 100644 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -104,12 +104,24 @@ <artifactId>selenium-java</artifactId> <version>2.25.0</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-chrome-driver</artifactId> <version>2.25.0</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/7cae60ea/activemq-leveldb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml index 32d5677..7aecbc3 100644 --- a/activemq-leveldb-store/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -120,6 +120,12 @@ <artifactId>org.linkedin.zookeeper-impl</artifactId> <version>${linkedin-zookeeper-version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.linkedin</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/7cae60ea/activemq-partition/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml index 007e7fa..bf55eb8 100644 --- a/activemq-partition/pom.xml +++ b/activemq-partition/pom.xml @@ -53,6 +53,12 @@ <groupId>org.linkedin</groupId> <artifactId>org.linkedin.zookeeper-impl</artifactId> <version>${linkedin-zookeeper-version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.linkedin</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/7cae60ea/activemq-spring/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index cda5019..447a969 100644 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -92,6 +92,12 @@ <artifactId>org.linkedin.zookeeper-impl</artifactId> <version>${linkedin-zookeeper-version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.linkedin</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/7cae60ea/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index bf586db..36e65fa 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -84,6 +84,12 @@ <groupId>org.linkedin</groupId> <artifactId>org.linkedin.zookeeper-impl</artifactId> <version>${linkedin-zookeeper-version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.linkedin</groupId>
