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

Upgraded to Camden SR5

Browse Source 
This commit upgrades Spring Cloud Task to Camden SR5 and makes the
required changes to do so.

Resolves #276
This commit is contained in:
Michael Minella
2017-02-07 14:27:19 -06:00
parent acaaad89f3
commit 2b8e5799f7
12 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.2.2.RELEASE</version>
<relativePath />
</parent>
@@ -132,12 +132,12 @@
</modules>
<properties>
<spring-cloud-stream.version>1.1.0.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.1.0.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.1.1.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-maven.version>
<spring-cloud-stream.version>1.1.1.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.1.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.1.3.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.1.2.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.1.3.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.1.3.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -44,12 +44,6 @@
<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>

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

@@ -10,7 +10,7 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.2.1.RELEASE</version>
<version>1.2.2.RELEASE</version>
<relativePath />
</parent>

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>
@@ -51,19 +51,19 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.1.1.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>

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

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.1.3.RELEASE</version>
</dependency>
<dependency>

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.2.RELEASE</version>
<scope>compile</scope>
</dependency>

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.1.1.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.1.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.2.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.1.1.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

6
spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java
View File

@@ -57,6 +57,12 @@ public class TaskSinkConfiguration {
TaskStatus taskStatus = new TaskStatus(taskLaunchId, state, null);
return taskStatus;
}
@Override
public void cleanup(String id) {}
@Override
public void destroy(String appName) {}
}
}

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

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<relativePath />
</parent>

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

@@ -41,6 +41,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-spi</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>