ARTEMIS-4589: consolidate utility code and remove the remaining test-…

…jar creations in tests/ tree
apache · Jan 30, 2024 · 8ad8c9d · 8ad8c9d
1 parent 14bbc04
commit 8ad8c9d
Show file tree

Hide file tree

Showing 70 changed files with 200 additions and 351 deletions.
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
@@ -167,12 +167,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-junit</artifactId>
-         <version>${project.version}</version>
-         <scope>test</scope>
-      </dependency>
 
       <!-- The johnzon-core and json-api contents are repackaged in -commons,
            However maven can still need them during tests, which run against

diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
@@ -80,11 +80,6 @@
          <artifactId>proton-j</artifactId>
          <scope>provided</scope>
       </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-buffer</artifactId>
@@ -115,6 +110,11 @@
          <artifactId>jakarta.jms-api</artifactId>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>jakarta.resource</groupId>
+         <artifactId>jakarta.resource-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
@@ -126,12 +126,28 @@
          <version>${project.version}</version>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jms-server</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-stomp-protocol</artifactId>
          <version>${project.version}</version>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j2-impl</artifactId>
+         <scope>provided</scope>
+      </dependency>
 
       <!-- This should be the only dependency not at 'provided' scope -->
       <dependency>

diff --git a/...ch/MultiThreadRandomReattachTestBase.java → ...ch/MultiThreadRandomReattachTestBase.java b/...ch/MultiThreadRandomReattachTestBase.java → ...ch/MultiThreadRandomReattachTestBase.java
diff --git a/...h/MultiThreadReattachSupportTestBase.java → ...h/MultiThreadReattachSupportTestBase.java b/...h/MultiThreadReattachSupportTestBase.java → ...h/MultiThreadReattachSupportTestBase.java