spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-49870
This commit is contained in:
Moritz Halbritter
2026-04-02 11:16:36 +02:00
parent dc375134f9 d437c11761
commit 09ece896a5
8 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java
+32
View File
@@ -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);
}
}
test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java
+33
View File
@@ -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);
}
}
test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
+7 -2
View File
@@ -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.