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

Migrate Task to Spring Cloud Build 2.0.x

Browse Source 
resolves #313
This commit is contained in:
Glenn Renfro
2017-05-22 09:15:44 -04:00
committed by Michael Minella
parent 54bce9a590
commit d95f46002f
32 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-task-integration-tests/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>spring-cloud-task-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.2.2.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Spring Cloud Task Integration Tests</name>

5
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.Test;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
@@ -248,8 +249,8 @@ public class BatchExecutionEventTests {
}
}
private Object[] getConfigurations(Class sinkClazz, Class jobConfigurationClazz) {
return new Object[]{
private Class[] getConfigurations(Class sinkClazz, Class jobConfigurationClazz) {
return new Class[]{PropertyPlaceholderAutoConfiguration.class,
jobConfigurationClazz,
sinkClazz };
}

4
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
@@ -59,7 +59,7 @@ public class TaskEventTests {
@Test
public void testTaskEventListener() throws Exception {
ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder().sources(new Object[] {TaskEventsConfiguration.class,
ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder().sources(new Class[] {TaskEventsConfiguration.class,
TaskEventAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class,
RabbitServiceAutoConfiguration.class}).build().run(new String[] {"--spring.cloud.task.closecontext_enable=false",