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 '3.5.x' into 4.0.x

Browse Source 
Closes gh-49869
This commit is contained in:
Moritz Halbritter
2026-04-02 11:12:20 +02:00
parent 4f47202910 bcb0007f9a
commit d437c11761
8 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java
+2 -2
View File
@@ -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;