diff --git a/pom.xml b/pom.xml index c8f8b8ab..f244dc10 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-build - 1.1.0.RC1 + 1.1.1.RELEASE diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index 33fadbbf..37111ddd 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -35,6 +35,12 @@ org.springframework.batch spring-batch-integration true + + + org.springframework + spring-core + + org.springframework diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 87f13020..5deaa673 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -11,17 +11,17 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.0.RC1 + 1.1.1.RELEASE 1.0.0.BUILD-SNAPSHOT - 1.0.0.RC3 - 1.0.0.M1 - 1.0.0.M1 - 1.0.0.RC3 - 1.0.0.M1 + 1.0.2.RELEASE + 1.0.0.RC1 + 1.0.0.RC1 + 1.0.2.RELEASE + 1.0.0.RC1 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index f3a2a79d..90bcefe8 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-deployer-local - 1.0.0.M1 + 1.0.0.RC1 diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index c79f72ed..9ecaf47f 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -43,7 +43,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.3.BUILD-SNAPSHOT + 1.0.2.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 58dd878b..6de6e9d8 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -35,7 +35,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.0.3.BUILD-SNAPSHOT + 1.0.2.RELEASE compile @@ -45,7 +45,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 1.0.3.BUILD-SNAPSHOT + 1.0.2.RELEASE test diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 1ee18ecf..eb37e508 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-deployer-local - 1.0.0.M1 + 1.0.0.RC1 org.springframework.cloud @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 1.0.3.BUILD-SNAPSHOT + 1.0.2.RELEASE test diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 2aa21f5f..d335a7ab 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -17,6 +17,12 @@ org.springframework.batch spring-batch-core + + + org.springframework + spring-core + + org.springframework.cloud @@ -51,6 +57,12 @@ spring-cloud-starter-stream-rabbit test + + org.springframework.cloud + spring-cloud-stream-test-support + 1.0.2.RELEASE + test + org.springframework.cloud spring-cloud-task-batch 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 69bae067..d77d38d5 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 @@ -35,6 +35,7 @@ import org.springframework.batch.core.StepExecution; 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; @@ -183,10 +184,10 @@ public class EventJobExecutionTests { ConfigurableApplicationContext applicationContext = SpringApplication.run(new Object[]{BatchEventAutoConfiguration.JobExecutionListenerConfiguration.class, EventJobExecutionConfiguration.class, - PropertyPlaceholderAutoConfiguration.class}, + PropertyPlaceholderAutoConfiguration.class, + TestSupportBinderAutoConfiguration.class}, new String[]{"--spring.cloud.task.closecontext.enable=false", "--spring.main.web-environment=false", - "--spring.cloud.stream.defaultBinder=test", disabledPropertyArg}); for (String beanName : LISTENER_BEAN_NAMES) { 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 fa18843e..0f5a9389 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 @@ -20,6 +20,7 @@ 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; @@ -43,10 +44,10 @@ public class TaskEventTests { ConfigurableApplicationContext applicationContext = SpringApplication.run(new Object[]{ TaskEventsConfiguration.class, TaskEventAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }, + PropertyPlaceholderAutoConfiguration.class, + TestSupportBinderAutoConfiguration.class}, new String[]{ "--spring.cloud.task.closecontext.enable=false", - "--spring.main.web-environment=false", - "--spring.cloud.stream.defaultBinder=test" }); + "--spring.main.web-environment=false"}); assertNotNull(applicationContext.getBean("taskEventListener")); assertNotNull(applicationContext.getBean(TaskEventAutoConfiguration.TaskEventChannels.class));