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/qpid-jms.git


The following commit(s) were added to refs/heads/main by this push:
     new cbd43602 QPIDJMS-591: Update test dependencies
cbd43602 is described below

commit cbd4360231c63dd284f87c5c00a396fe1eaac38a
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Tue Jun 27 11:47:50 2023 +0100

    QPIDJMS-591: Update test dependencies
    
    - Mockito to 5.4.0
    - Jacoco plugin to 0.8.10
    - Jetty to 9.4.51.v20230217
    - minikdc to 3.3.6
    - commons-io to 2.13.0 [transitive of minikdc]
    - ActiveMQ to 5.18.1 (and trim unused jackson-databind and spring 
transitives)
---
 pom.xml                                            | 12 ++++-----
 qpid-jms-discovery/pom.xml                         | 31 ----------------------
 .../qpid-jms-activemq-tests/pom.xml                | 29 ++++++++++++++------
 3 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f5a7184..78ad9644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,13 +46,13 @@
 
     <!-- Test Dependency Versions for this Project -->
     <netty-tcnative-version>2.0.61.Final</netty-tcnative-version>
-    <activemq-version>5.17.2</activemq-version>
+    <activemq-version>5.18.1</activemq-version>
     <junit-version>4.13.2</junit-version>
-    <jetty-version>9.4.48.v20220622</jetty-version>
-    <mockito-version>4.8.0</mockito-version>
+    <jetty-version>9.4.51.v20230217</jetty-version>
+    <mockito-version>5.4.0</mockito-version>
     <hamcrest-version>2.2</hamcrest-version>
-    <hadoop-minikdc-version>3.3.4</hadoop-minikdc-version>
-    <commons-io-version>2.11.0</commons-io-version>
+    <hadoop-minikdc-version>3.3.6</hadoop-minikdc-version>
+    <commons-io-version>2.13.0</commons-io-version>
 
     <!-- Maven Plugin Versions for this Project -->
     <maven-javacc-plugin-version>2.6</maven-javacc-plugin-version>
@@ -60,7 +60,7 @@
     <maven-idea-plugin-version>2.5</maven-idea-plugin-version>
     <maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
     <findbugs-maven-plugin-version>3.0.2</findbugs-maven-plugin-version>
-    <jacoco-plugin-version>0.8.8</jacoco-plugin-version>
+    <jacoco-plugin-version>0.8.10</jacoco-plugin-version>
 
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/qpid-jms-discovery/pom.xml b/qpid-jms-discovery/pom.xml
index 577916eb..30d5ad72 100644
--- a/qpid-jms-discovery/pom.xml
+++ b/qpid-jms-discovery/pom.xml
@@ -57,37 +57,6 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
-      <version>${activemq-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-kahadb-store</artifactId>
-      <version>${activemq-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-amqp</artifactId>
-      <version>${activemq-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-jaas</artifactId>
-      <version>${activemq-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-spring</artifactId>
-      <version>${activemq-version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index e2493565..bc04e629 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -49,14 +49,6 @@
     <!-- Required Dependencies               -->
     <!-- =================================== -->
 
-    <!-- Adding the JMS 1.1 API jar for these tests explicitly, first,
-         since its whats implemented by ActiveMQ, and also helps to
-         verify the client works when both APIs are on the classpath -->
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-jms-client</artifactId>
@@ -89,11 +81,26 @@
       <artifactId>websocket-server</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Adding old JMS 2.0 API dep for these tests explicitly as
+         ActiveMQ 5.18 needs it, but we are already dep managing
+         the jakarta.jms-api API dep to 3.1 for qpid-jms-client -->
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_2.0_spec</artifactId>
+      <version>1.0-alpha-2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
       <version>${activemq-version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -118,6 +125,12 @@
       <artifactId>activemq-http</artifactId>
       <version>${activemq-version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq.tooling</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to