This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 247263c12c6ea246b9f200f3836b1ff6027435ae Author: Domenico Francesco Bruscino <[email protected]> AuthorDate: Mon Jun 26 17:50:07 2023 +0200 ARTEMIS-4335 Upgrade bcprov to bcprov-jdk18on:1.75 --- artemis-server/pom.xml | 35 ++++++++++++++++++++++++++++++++ pom.xml | 11 +++++++--- tests/integration-tests-isolated/pom.xml | 19 +++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml index d3c261f204..e2fd69dea2 100644 --- a/artemis-server/pom.xml +++ b/artemis-server/pom.xml @@ -201,6 +201,19 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-protocol-ldap</artifactId> + <version>${directory-version}</version> + <scope>test</scope> + <exclusions> + <!-- exclude bcprov-jdk15on to avoid conflicts with bcprov-jdk18on --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.directory.server</groupId> <artifactId>apacheds-test-framework</artifactId> @@ -273,8 +286,30 @@ <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> </exclusion> + <!-- exclude bcprov-jdk15on to avoid conflicts with bcprov-jdk18on --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + <!-- exclude bcpkix-jdk15on to avoid conflicts with bcpkix-jdk18on --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <!-- bcprov-jdk18on replaces bcprov-jdk15on excluded from apacheds-protocol-ldap and mockserver-netty --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <scope>test</scope> + </dependency> + <!-- bcprov-jdk18on replaces bcpkix-jdk15on excluded by mockserver-netty --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <scope>test</scope> + </dependency> </dependencies> <profiles> diff --git a/pom.xml b/pom.xml index 16e901e58e..41f02114f6 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ <directory-version>2.0.0.AM25</directory-version> <directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version> - <bcprov-jdk15on-version>1.70</bcprov-jdk15on-version> + <bc-java-version>1.75</bc-java-version> <netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier> <netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier> @@ -400,8 +400,13 @@ <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>${bcprov-jdk15on-version}</version> + <artifactId>bcprov-jdk18on</artifactId> + <version>${bc-java-version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>${bc-java-version}</version> </dependency> <!-- ## End Test Dependencies ## --> diff --git a/tests/integration-tests-isolated/pom.xml b/tests/integration-tests-isolated/pom.xml index dd09d4980f..551d4efa05 100644 --- a/tests/integration-tests-isolated/pom.xml +++ b/tests/integration-tests-isolated/pom.xml @@ -270,6 +270,25 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-protocol-ldap</artifactId> + <version>${directory-version}</version> + <scope>test</scope> + <exclusions> + <!-- exclude bcprov-jdk15on to avoid conflicts with bcprov-jdk18on --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- bcprov-jdk18on replaces bcprov-jdk15on excluded from apacheds-protocol-ldap and mockserver-netty --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.directory.server</groupId> <artifactId>apacheds-test-framework</artifactId>
