Updated dependencies and refactored code.

* Updated spring cloud streams to 1.1.0.RELEASE
* Updated cloud dependencies parent to 1.2.1.RELEASE
* Updated samples to 1.4.1
* Updated Tests to take advantage of 1.4 boot test annotations
* Removed @Bindings as they are deprecated
* Updated BatchApplication test to pass.  Boot no longer logs environment values.  So count was reduced from 3 to 1

resolves #218, #221

renamed spring-cloud-task-starter to spring-cloud-starter-task
This commit is contained in:
Glenn Renfro
2016-10-05 15:10:39 -04:00
committed by Michael Minella
parent 441bbfe492
commit d657b22b79
19 changed files with 46 additions and 50 deletions

View File

@@ -34,9 +34,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties;
import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher;
import org.springframework.cloud.deployer.spi.task.TaskLauncher;
import org.springframework.cloud.stream.annotation.Bindings;
import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.task.launcher.util.TaskLauncherSinkApplication;
import org.springframework.cloud.task.repository.TaskExecution;
import org.springframework.cloud.task.repository.TaskExplorer;
@@ -84,7 +83,6 @@ public class TaskLauncherSinkTests {
public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport();
@Autowired
@Bindings(TaskLauncherSink.class)
private Sink sink;
private DataSource dataSource;

View File

@@ -31,8 +31,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.task.batch.listener.BatchEventAutoConfiguration;
import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent;
import org.springframework.cloud.task.batch.listener.support.StepExecutionEvent;

View File

@@ -29,8 +29,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.binder.rabbit.config.RabbitServiceAutoConfiguration;
import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport;
import org.springframework.cloud.task.configuration.EnableTask;
import org.springframework.cloud.task.repository.TaskExecution;
import org.springframework.context.ConfigurableApplicationContext;