Skip to content

Commit

Permalink
QPIDJMS-591: Update test dependencies
Browse files Browse the repository at this point in the history
- 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)

(cherry picked from commit cbd4360) with fixups
  • Loading branch information
gemmellr committed Jun 27, 2023
1 parent 23f3dc0 commit d961da6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 45 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@

<!-- 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>
<fuse-joram-tests-version>1.0</fuse-joram-tests-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>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<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>
Expand Down
31 changes: 0 additions & 31 deletions qpid-jms-discovery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
20 changes: 12 additions & 8 deletions qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -105,6 +97,12 @@
<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>
Expand All @@ -129,6 +127,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>
Expand Down

0 comments on commit d961da6

Please sign in to comment.