diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc index 20b063a2715..1cfc19161f1 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc @@ -87,7 +87,7 @@ The following service connections are currently supported: | Containers named "symptoma/activemq", "apache/activemq-classic" or "apache/activemq" | javadoc:org.springframework.boot.artemis.autoconfigure.ArtemisConnectionDetails[] -| Containers named "apache/activemq-artemis" +| Containers named "apache/activemq-artemis" or "apache/artemis" | javadoc:org.springframework.boot.cassandra.autoconfigure.CassandraConnectionDetails[] | Containers named "cassandra" diff --git a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java index a06c69aa6b7..dc492d378a5 100644 --- a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -27,9 +27,18 @@ import static org.assertj.core.api.Assertions.assertThat; * Integration tests for {@link ArtemisDockerComposeConnectionDetailsFactory}. * * @author Eddú Meléndez + * @author Moritz Halbritter */ class ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests { + @DockerComposeTest(composeFile = "artemis-compose.yaml", image = TestImage.ARTEMIS_LEGACY) + void runCreatesConnectionDetailsWithLegacyImage(ArtemisConnectionDetails connectionDetails) { + assertThat(connectionDetails.getMode()).isEqualTo(ArtemisMode.NATIVE); + assertThat(connectionDetails.getBrokerUrl()).isNotNull().startsWith("tcp://"); + assertThat(connectionDetails.getUser()).isEqualTo("root"); + assertThat(connectionDetails.getPassword()).isEqualTo("secret"); + } + @DockerComposeTest(composeFile = "artemis-compose.yaml", image = TestImage.ARTEMIS) void runCreatesConnectionDetails(ArtemisConnectionDetails connectionDetails) { assertThat(connectionDetails.getMode()).isEqualTo(ArtemisMode.NATIVE); diff --git a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java index ce290561ced..82f4e2e0c80 100644 --- a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,7 +22,6 @@ import java.util.List; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -31,6 +30,7 @@ import org.springframework.boot.artemis.autoconfigure.ArtemisAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.boot.testsupport.container.ArtemisLegacyContainer; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +51,7 @@ class ArtemisContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final ArtemisContainer artemis = TestImage.container(ArtemisContainer.class); + static final ArtemisLegacyContainer artemis = TestImage.container(ArtemisLegacyContainer.class); @Autowired private JmsClient jmsClient; diff --git a/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactory.java b/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactory.java index 6633df7ea49..fb7e36fcfba 100644 --- a/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactory.java +++ b/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/docker/compose/ArtemisDockerComposeConnectionDetailsFactory.java @@ -37,7 +37,7 @@ class ArtemisDockerComposeConnectionDetailsFactory private static final int ACTIVEMQ_PORT = 61616; protected ArtemisDockerComposeConnectionDetailsFactory() { - super("apache/activemq-artemis"); + super(new String[] { "apache/activemq-artemis", "apache/artemis" }); } @Override diff --git a/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java b/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java index e5903c266bb..3b86617b147 100644 --- a/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java +++ b/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java @@ -21,7 +21,6 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -30,6 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.boot.testsupport.container.ArtemisLegacyContainer; import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; @@ -47,7 +47,7 @@ class SampleArtemisTests { @Container @ServiceConnection - private static final ArtemisContainer container = TestImage.container(ArtemisContainer.class); + private static final ArtemisLegacyContainer container = TestImage.container(ArtemisLegacyContainer.class); @Autowired private Producer producer; diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java new file mode 100644 index 00000000000..4e30d5cbf7a --- /dev/null +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.testsupport.container; + +import org.testcontainers.utility.DockerImageName; + +/** + * An {@link org.testcontainers.activemq.ArtemisContainer} for {@code apache/artemis}. + * + * @author Moritz Halbritter + */ +public final class ArtemisContainer extends org.testcontainers.activemq.ArtemisContainer { + + public ArtemisContainer(DockerImageName dockerImageName) { + super(dockerImageName); + } + +} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java new file mode 100644 index 00000000000..2edeeb1ea0b --- /dev/null +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java @@ -0,0 +1,33 @@ +/* + * Copyright 2012-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.testsupport.container; + +import org.testcontainers.activemq.ArtemisContainer; +import org.testcontainers.utility.DockerImageName; + +/** + * An {@link ArtemisContainer} for {@code apache/activemq-artemis}. + * + * @author Moritz Halbritter + */ +public final class ArtemisLegacyContainer extends ArtemisContainer { + + public ArtemisLegacyContainer(DockerImageName dockerImageName) { + super(dockerImageName); + } + +} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index 3b2bf29eab3..02e3ec66100 100644 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -25,7 +25,6 @@ import java.util.function.Supplier; import com.redis.testcontainers.RedisContainer; import com.redis.testcontainers.RedisStackContainer; -import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.containers.Container; import org.testcontainers.containers.GenericContainer; @@ -83,7 +82,13 @@ public enum TestImage { /** * A container image suitable for testing Artemis. */ - ARTEMIS("apache/activemq-artemis", "2.34.0", () -> ArtemisContainer.class), + ARTEMIS("apache/artemis", "2.53.0", () -> ArtemisContainer.class), + + /** + * A container image suitable for testing Artemis using the legacy + * {@code apache/activemq-artemis} image. + */ + ARTEMIS_LEGACY("apache/activemq-artemis", "2.34.0", () -> ArtemisLegacyContainer.class), /** * A container image suitable for testing Cassandra.