diff --git a/pom.xml b/pom.xml index 05034fe5..1faed94a 100755 --- a/pom.xml +++ b/pom.xml @@ -125,16 +125,16 @@ spring-cloud-task-docs spring-cloud-task-batch spring-cloud-task-stream - spring-cloud-task-starter + spring-cloud-starter-task spring-cloud-task-samples spring-cloud-task-integration-tests - 1.0.2.RELEASE + 1.1.0.RELEASE 1.0.2.RELEASE 1.0.2.RELEASE - 1.0.2.RELEASE + 1.1.0.RELEASE 1.0.2.RELEASE 1.0.2.RELEASE 3.0.7.RELEASE diff --git a/spring-cloud-task-starter/pom.xml b/spring-cloud-starter-task/pom.xml similarity index 95% rename from spring-cloud-task-starter/pom.xml rename to spring-cloud-starter-task/pom.xml index c04a0527..2740bbec 100644 --- a/spring-cloud-task-starter/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -9,7 +9,7 @@ 1.1.0.BUILD-SNAPSHOT - spring-cloud-task-starter + spring-cloud-starter-task jar Spring Cloud Task Starter Spring Boot starter for Spring Cloud Task diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index ef85f365..69e4e042 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.1.RELEASE + 1.2.1.RELEASE @@ -18,7 +18,7 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task ${project.version} diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 3177e7aa..23a15694 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -44,6 +44,12 @@ spring-cloud-starter-stream-rabbit test + + org.springframework.cloud + spring-cloud-stream-binder-rabbit-test-support + ${spring-cloud-stream-binder-rabbit.version} + test + org.springframework.batch spring-batch-core 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 819fd635..924dc564 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 @@ -34,9 +34,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties; import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher; import org.springframework.cloud.deployer.spi.task.TaskLauncher; -import org.springframework.cloud.stream.annotation.Bindings; +import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.launcher.util.TaskLauncherSinkApplication; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.cloud.task.repository.TaskExplorer; @@ -84,7 +83,6 @@ public class TaskLauncherSinkTests { public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); @Autowired - @Bindings(TaskLauncherSink.class) private Sink sink; private DataSource dataSource; diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java index f4e037fe..65e75dd7 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java @@ -31,8 +31,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; +import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.BatchEventAutoConfiguration; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.cloud.task.batch.listener.support.StepExecutionEvent; diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index e926de36..2a4f80f4 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -29,8 +29,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.cloud.stream.binder.rabbit.config.RabbitServiceAutoConfiguration; +import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index dee48e5b..5bbc3125 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -51,18 +51,24 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.2.RELEASE + 1.1.0.RELEASE compile org.springframework.cloud - spring-cloud-stream-test-support-internal - 1.0.2.RELEASE + spring-cloud-stream-binder-rabbit-test-support + 1.1.0.RELEASE test org.springframework.cloud - spring-cloud-task-starter + spring-cloud-stream-test-support-internal + 1.1.0.RELEASE + test + + + org.springframework.cloud + spring-cloud-starter-task org.hsqldb diff --git a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java index fd8d9a2f..7a49c285 100644 --- a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java +++ b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java @@ -29,8 +29,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.rule.OutputCapture; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; +import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.context.annotation.PropertySource; diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index b2dae1a4..af49950c 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -41,7 +41,7 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task com.h2database diff --git a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java index faa35f05..1444bddb 100644 --- a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java +++ b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java @@ -77,7 +77,7 @@ public class BatchJobApplicationTests { while (matcher.find()) { count++; } - assertEquals("The number of task titles did not match expected: ", 3, count); + assertEquals("The number of task titles did not match expected: ", 1, count); } } diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 3545ee2e..c2ff856d 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -41,7 +41,7 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 326df649..40b43084 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -42,13 +42,13 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.2.RELEASE + 1.1.0.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 37a02db5..d510d9a0 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -41,12 +41,12 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.2.RELEASE + 1.1.0.RELEASE compile @@ -56,7 +56,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 1.0.2.RELEASE + 1.1.0.RELEASE test diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 8995f5c9..c53b2cb8 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -46,18 +46,18 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.2.RELEASE + 1.1.0.RELEASE compile org.springframework.cloud spring-cloud-stream-test-support - 1.0.2.RELEASE + 1.1.0.RELEASE test diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 859f9996..05181de8 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.1.RELEASE @@ -46,7 +46,7 @@ org.springframework.cloud - spring-cloud-task-starter + spring-cloud-starter-task org.springframework.boot diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java index 100d69e0..b9724fc3 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Test; import org.springframework.batch.core.JobExecution; @@ -36,7 +35,6 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.cloud.task.batch.listener.support.StepExecutionEvent; import org.springframework.cloud.task.configuration.EnableTask; @@ -64,9 +62,6 @@ public class EventJobExecutionTests { private JobParameters jobParameters; private JobInstance jobInstance; - @ClassRule - public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); - @Before public void setup() { jobInstance = new JobInstance(JOB_INSTANCE_ID, JOB_NAME); diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 1ada2e5c..e95fd9a0 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,7 +30,6 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.deployer.spi.task.LaunchState; import org.springframework.cloud.stream.annotation.Bindings; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.launcher.configuration.TaskConfiguration; import org.springframework.cloud.task.launcher.util.TaskLauncherSinkApplication; import org.springframework.context.ApplicationContext; @@ -57,9 +55,6 @@ public class TaskLauncherSinkTests { private Map properties; - @ClassRule - public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); - private final static String DEFAULT_STATUS = "test_status"; @Autowired diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index 0f5a9389..7c9fbcd4 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -15,13 +15,11 @@ */ package org.springframework.cloud.task.listener; -import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; -import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -31,12 +29,10 @@ import static org.junit.Assert.assertNotNull; /** * @author Michael Minella * @author Ilayaperumal Gopinathan + * @author Glenn Renfro */ public class TaskEventTests { - @Rule - public RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); - private static final String TASK_NAME = "taskEventTest"; @Test