Repository: activemq Updated Branches: refs/heads/trunk 64baf092f -> 810ce35f5
https://issues.apache.org/jira/browse/AMQ-5175 Exclude the BouncyCastle jar from the tests. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/810ce35f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/810ce35f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/810ce35f Branch: refs/heads/trunk Commit: 810ce35f559473e3ab5eaf659b879a7de178ebf5 Parents: 64baf09 Author: Timothy Bish <[email protected]> Authored: Tue May 6 13:38:53 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Tue May 6 13:38:53 2014 -0400 ---------------------------------------------------------------------- activemq-jaas/pom.xml | 6 ++++++ activemq-unit-tests/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/810ce35f/activemq-jaas/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml index d6488d5..9bd147f 100644 --- a/activemq-jaas/pom.xml +++ b/activemq-jaas/pom.xml @@ -73,6 +73,12 @@ <artifactId>apacheds-core-integ</artifactId> <version>${directory-version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.directory.server</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/810ce35f/activemq-unit-tests/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index 6adc47d..eefee66 100755 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -282,6 +282,12 @@ <artifactId>apacheds-core-integ</artifactId> <version>${directory-version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.directory.server</groupId>
