Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Artemis testcontainers support into spring-boot-artemis

Browse Source
This commit is contained in:
Stéphane Nicoll
2025-05-19 14:30:05 +02:00
committed by Phillip Webb
parent 52f3d4cbdb
commit abdc0fdf90
8 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-artemis/build.gradle
View File

@@ -1,5 +1,6 @@
plugins {
id "java-library"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed"
@@ -13,11 +14,17 @@ dependencies {
api("org.apache.activemq:artemis-jakarta-client")
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("org.apache.activemq:artemis-jakarta-server")
optional("org.messaginghub:pooled-jms") {
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-tools:spring-boot-test-support"))

2
spring-boot-project/spring-boot-testcontainers-all/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/activemq/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java → spring-boot-project/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java
View File

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

2
spring-boot-project/spring-boot-testcontainers-all/src/main/java/org/springframework/boot/testcontainers/service/connection/activemq/ArtemisContainerConnectionDetailsFactory.java → spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactory.java
View File

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

4
spring-boot-project/spring-boot-testcontainers-all/src/main/java/org/springframework/boot/testcontainers/service/connection/activemq/package-info.java → spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/testcontainers/package-info.java
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;

2
spring-boot-project/spring-boot-artemis/src/main/resources/META-INF/spring.factories Normal file
View File

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

4
spring-boot-project/spring-boot-artemis/src/test/resources/logback-test.xml Normal file
View File

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

4
spring-boot-project/spring-boot-testcontainers-all/build.gradle
View File

@@ -41,7 +41,6 @@ dependencies {
dockerTestImplementation("org.mockito:mockito-core")
dockerTestImplementation("org.springframework:spring-core-test")
dockerTestImplementation("org.springframework:spring-jdbc")
dockerTestImplementation("org.springframework:spring-jms")
dockerTestImplementation("org.springframework.amqp:spring-rabbit")
dockerTestImplementation("org.springframework.data:spring-data-redis")
dockerTestImplementation("org.springframework.kafka:spring-kafka")
@@ -56,7 +55,6 @@ dependencies {
dockerTestRuntimeOnly("org.postgresql:postgresql")
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-cassandra"))
optional(project(":spring-boot-project:spring-boot-couchbase"))
@@ -76,7 +74,6 @@ dependencies {
optional("org.springframework:spring-test")
optional("org.springframework.data:spring-data-mongodb")
optional("org.springframework.data:spring-data-neo4j")
optional("org.testcontainers:activemq")
optional("org.testcontainers:cassandra")
optional("org.testcontainers:clickhouse")
optional("org.testcontainers:couchbase")
@@ -103,7 +100,6 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers")))
testImplementation("org.springframework:spring-jdbc")
testImplementation("org.springframework:spring-jms")
testImplementation("org.springframework.amqp:spring-rabbit")
testImplementation("org.springframework.data:spring-data-redis")
testImplementation("org.springframework.kafka:spring-kafka")

1
spring-boot-project/spring-boot-testcontainers-all/src/main/resources/META-INF/spring.factories
View File

@@ -1,6 +1,5 @@
# Connection Details Factories
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.cassandra.CassandraContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.cassandra.DeprecatedCassandraContainerConnectionDetailsFactory,\