SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies to latest

Browse Source 
This commit brings the dependencies for Spring Cloud Task up to the
latest where appropriate prior to the 1.0.0.RC1 release.
This commit is contained in:
Michael Minella
2016-06-14 11:47:49 -05:00
parent f38e1c4195
commit 30fe0602d0
10 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.1.0.RC1</version>
<version>1.1.1.RELEASE</version>
<relativePath />
</parent>

6
spring-cloud-task-batch/pom.xml
View File

@@ -35,6 +35,12 @@
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-integration</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
spring-cloud-task-dependencies/pom.xml
View File

@@ -11,17 +11,17 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.1.0.RC1</version>
<version>1.1.1.RELEASE</version>
<relativePath/>
</parent>
<properties>
<spring-cloud-task.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-task.version>
<spring-cloud-stream.version>1.0.0.RC3</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.0.0.M1</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.0.M1</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.0.0.RC3</spring-cloud-stream-binder-rabbit.version>
<spring.cloud.deployer.resource.support>1.0.0.M1</spring.cloud.deployer.resource.support>
<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.0.0.RC1</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.0.RC1</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.0.2.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring.cloud.deployer.resource.support>1.0.0.RC1</spring.cloud.deployer.resource.support>
</properties>
<dependencyManagement>
<dependencies>

2
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.0.0.M1</version>
<version>1.0.0.RC1</version>
</dependency>
<dependency>

2
spring-cloud-task-samples/task-events/pom.xml
View File

@@ -43,7 +43,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version>
<version>1.0.2.RELEASE</version>
<scope>compile</scope>
</dependency>

4
spring-cloud-task-samples/taskprocessor/pom.xml
View File

@@ -35,7 +35,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version>
<version>1.0.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version>
<version>1.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

4
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.0.0.M1</version>
<version>1.0.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version>
<version>1.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

12
spring-cloud-task-stream/pom.xml
View File

@@ -17,6 +17,12 @@
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -51,6 +57,12 @@
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-batch</artifactId>

5
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java
View File

@@ -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) {

7
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java
View File

@@ -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));