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 fef7c147eb1229471b726c9c6898057036c3bdb1 Author: Domenico Francesco Bruscino <[email protected]> AuthorDate: Mon Jun 26 18:39:12 2023 +0200 ARTEMIS-4336 Upgrade mockserver version to 5.15.0 --- artemis-server/pom.xml | 18 +----------------- pom.xml | 2 +- tests/integration-tests-isolated/pom.xml | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml index e2fd69dea2..0c157f7e1f 100644 --- a/artemis-server/pom.xml +++ b/artemis-server/pom.xml @@ -286,30 +286,14 @@ <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 --> + <!-- bcprov-jdk18on replaces bcprov-jdk15on excluded from apacheds-protocol-ldap --> <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 41f02114f6..ec6e1b42b6 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <groovy.version>4.0.10</groovy.version> <vertx.version>4.3.3</vertx.version> <hadoop.minikdc.version>3.3.1</hadoop.minikdc.version> - <mockserver.version>5.13.2</mockserver.version> + <mockserver.version>5.15.0</mockserver.version> <owasp.version>6.1.0</owasp.version> <spring.version>5.3.27</spring.version> diff --git a/tests/integration-tests-isolated/pom.xml b/tests/integration-tests-isolated/pom.xml index 551d4efa05..12178fdea2 100644 --- a/tests/integration-tests-isolated/pom.xml +++ b/tests/integration-tests-isolated/pom.xml @@ -283,7 +283,7 @@ </exclusion> </exclusions> </dependency> - <!-- bcprov-jdk18on replaces bcprov-jdk15on excluded from apacheds-protocol-ldap and mockserver-netty --> + <!-- bcprov-jdk18on replaces bcprov-jdk15on excluded from apacheds-protocol-ldap --> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk18on</artifactId>
