diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 6cf13d52..5b127fd4 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -28,8 +28,6 @@ import org.h2.tools.Server; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.RabbitMQContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -71,8 +69,8 @@ public class TaskLauncherSinkTests { private final static int MAX_WAIT_TIME = 120000; - private final static String URL = "maven://org.springframework.cloud.task.app:" - + "timestamp-task:2.1.1.RELEASE"; + private final static String URL = "maven://io.spring.cloud:" + + "timestamp-task:3.0.0-SNAPSHOT"; private final static String DATASOURCE_URL; @@ -90,11 +88,6 @@ public class TaskLauncherSinkTests { randomPort = TestSocketUtils.findAvailableTcpPort(); DATASOURCE_URL = "jdbc:h2:tcp://localhost:" + randomPort + "/mem:dataflow;DB_CLOSE_DELAY=-1;" + "DB_CLOSE_ON_EXIT=FALSE"; - GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.8.9") - .withExposedPorts(5672); - rabbitmq.start(); - final Integer mappedPort = rabbitmq.getMappedPort(5672); - System.setProperty("spring.rabbitmq.test.port", mappedPort.toString()); } @Autowired diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 6c023d20..a66ea50b 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -23,7 +23,7 @@ 1.16.3 1.16.3 1.0.8 - 4.0.0-M1 + 4.0.0-SNAPSHOT 3.0.0-SNAPSHOT diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index aed37aea..6291686a 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -20,7 +20,7 @@ UTF-8 17 - 4.0.0-M1 + 4.0.0-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 05146b0a..0dfffc14 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -21,7 +21,7 @@ UTF-8 true - 4.0.0-M1 + 4.0.0-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 7df19250..94686091 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -22,7 +22,7 @@ UTF-8 true - 4.0.0-M1 + 4.0.0-SNAPSHOT 4.0.0-SNAPSHOT 2.8.0-SNAPSHOT