Move Artemis testcontainers support into spring-boot-artemis

Issue: 46083
This commit is contained in:
Stéphane Nicoll 2025-05-19 14:30:05 +02:00 committed by Phillip Webb
parent 6597ff8e9d
commit fcfe24adff
8 changed files with 17 additions and 9 deletions

View File

@ -17,6 +17,7 @@
plugins { plugins {
id "java-library" id "java-library"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.auto-configuration" id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties" id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed" id "org.springframework.boot.deployed"
@ -30,11 +31,17 @@ dependencies {
api("org.apache.activemq:artemis-jakarta-client") api("org.apache.activemq:artemis-jakarta-client")
optional(project(":spring-boot-project:spring-boot-autoconfigure")) optional(project(":spring-boot-project:spring-boot-autoconfigure"))
optional(project(":spring-boot-project:spring-boot-testcontainers"))
optional(project(":spring-boot-project:spring-boot-tx")) optional(project(":spring-boot-project:spring-boot-tx"))
optional("org.apache.activemq:artemis-jakarta-server") optional("org.apache.activemq:artemis-jakarta-server")
optional("org.messaginghub:pooled-jms") { optional("org.messaginghub:pooled-jms") {
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec" exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
} }
optional("org.testcontainers:activemq")
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("ch.qos.logback:logback-classic")
dockerTestImplementation("org.testcontainers:junit-jupiter")
testImplementation(project(":spring-boot-project:spring-boot-test")) testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.testcontainers.service.connection.activemq; package org.springframework.boot.artemis.testcontainers;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.testcontainers.service.connection.activemq; package org.springframework.boot.artemis.testcontainers;
import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.activemq.ArtemisContainer;

View File

@ -15,6 +15,6 @@
*/ */
/** /**
* Support for testcontainers ActiveMQ service connections. * Support for testcontainers Artemis service connections.
*/ */
package org.springframework.boot.testcontainers.service.connection.activemq; package org.springframework.boot.artemis.testcontainers;

View File

@ -0,0 +1,2 @@
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
org.springframework.boot.artemis.testcontainers.ArtemisContainerConnectionDetailsFactory

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
</configuration>

View File

@ -58,7 +58,6 @@ dependencies {
dockerTestImplementation("org.mockito:mockito-core") dockerTestImplementation("org.mockito:mockito-core")
dockerTestImplementation("org.springframework:spring-core-test") dockerTestImplementation("org.springframework:spring-core-test")
dockerTestImplementation("org.springframework:spring-jdbc") dockerTestImplementation("org.springframework:spring-jdbc")
dockerTestImplementation("org.springframework:spring-jms")
dockerTestImplementation("org.springframework.amqp:spring-rabbit") dockerTestImplementation("org.springframework.amqp:spring-rabbit")
dockerTestImplementation("org.springframework.data:spring-data-redis") dockerTestImplementation("org.springframework.data:spring-data-redis")
dockerTestImplementation("org.springframework.kafka:spring-kafka") dockerTestImplementation("org.springframework.kafka:spring-kafka")
@ -73,7 +72,6 @@ dependencies {
dockerTestRuntimeOnly("org.postgresql:postgresql") dockerTestRuntimeOnly("org.postgresql:postgresql")
optional(project(":spring-boot-project:spring-boot-amqp")) optional(project(":spring-boot-project:spring-boot-amqp"))
optional(project(":spring-boot-project:spring-boot-artemis"))
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure-all")) optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
optional(project(":spring-boot-project:spring-boot-cassandra")) optional(project(":spring-boot-project:spring-boot-cassandra"))
optional(project(":spring-boot-project:spring-boot-couchbase")) optional(project(":spring-boot-project:spring-boot-couchbase"))
@ -93,7 +91,6 @@ dependencies {
optional("org.springframework:spring-test") optional("org.springframework:spring-test")
optional("org.springframework.data:spring-data-mongodb") optional("org.springframework.data:spring-data-mongodb")
optional("org.springframework.data:spring-data-neo4j") optional("org.springframework.data:spring-data-neo4j")
optional("org.testcontainers:activemq")
optional("org.testcontainers:cassandra") optional("org.testcontainers:cassandra")
optional("org.testcontainers:clickhouse") optional("org.testcontainers:clickhouse")
optional("org.testcontainers:couchbase") optional("org.testcontainers:couchbase")
@ -120,7 +117,6 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers"))) testImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers")))
testImplementation("org.springframework:spring-jdbc") testImplementation("org.springframework:spring-jdbc")
testImplementation("org.springframework:spring-jms")
testImplementation("org.springframework.amqp:spring-rabbit") testImplementation("org.springframework.amqp:spring-rabbit")
testImplementation("org.springframework.data:spring-data-redis") testImplementation("org.springframework.data:spring-data-redis")
testImplementation("org.springframework.kafka:spring-kafka") testImplementation("org.springframework.kafka:spring-kafka")

View File

@ -1,6 +1,5 @@
# Connection Details Factories # Connection Details Factories
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
org.springframework.boot.testcontainers.service.connection.activemq.ArtemisContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.amqp.RabbitContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.amqp.RabbitContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.cassandra.CassandraContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.cassandra.CassandraContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.cassandra.DeprecatedCassandraContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.cassandra.DeprecatedCassandraContainerConnectionDetailsFactory,\