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

Updated for deployer updates

Browse Source 
In the release process of SCDF, it was identified that Spring Cloud
Deployer had been upgraded to JDK 1.8 which was not desirable at the
given time.  As part of the rollback, the deployer implementations
provided remained at 1.8, but the SPI was rolled back to 1.7.  This
commit addresses the difference between the different versions as well
as updates the code to use the latest `TaskLauncher` code.
This commit is contained in:
Michael Minella
2016-11-21 16:21:33 -06:00
parent 986a2a098d
commit 32b0278930
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -133,11 +133,11 @@
<properties>
<spring-cloud-stream.version>1.1.0.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.1.0.RELEASE</spring-cloud-deployer-spi.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.0.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.1.0.RELEASE</spring-cloud-deployer-resource-maven.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-batch.version>3.0.7.RELEASE</spring-batch.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -160,10 +160,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
</configuration>
</plugin>
<plugin>

10
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java
View File

@@ -65,6 +65,16 @@ public class TaskConfiguration {
return new TaskStatus(LAUNCH_ID, state, null);
}
@Override
public void cleanup(String id) {
throw new UnsupportedOperationException("Cleanup is not supported");
}
@Override
public void destroy(String appName) {
throw new UnsupportedOperationException("Destroy is not supported");
}
public List<String> getCommandlineArguments() {
return commandlineArguments;
}