diff --git a/README.adoc b/README.adoc index 2903bcff..03bdbcf2 100644 --- a/README.adoc +++ b/README.adoc @@ -16,13 +16,6 @@ process persists beyond the life of the task for future reporting. $ ./mvnw clean install ---- -== Build Samples: - -[source,shell,indent=2] ----- -$ ./mvnw -P samples clean install ----- - == Example: [source,java,indent=2] diff --git a/pom.xml b/pom.xml index 00ac47f7..23ae2ac2 100755 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,8 @@ spring-cloud-task-batch spring-cloud-task-stream spring-cloud-task-starter + spring-cloud-task-integration-tests + spring-cloud-task-samples @@ -218,17 +220,5 @@ - - samples - - spring-cloud-task-samples - - - - integration-test - - spring-cloud-task-integration-tests - - diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 8c6319bd..814c4d66 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -16,11 +16,11 @@ 1.0.2.RELEASE - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE + 1.0.2.RELEASE 1.0.2.RELEASE - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE + 1.0.2.RELEASE 3.0.7.RELEASE @@ -87,6 +87,11 @@ spring-batch-core ${spring-batch.version} + + org.springframework.cloud + spring-cloud-stream-test-support + ${spring-cloud-stream.version} + diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 78af7978..3a5de590 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -46,4 +46,15 @@ spring-cloud-deployer-resource-support + + + + + maven-deploy-plugin + + true + + + + diff --git a/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java index cb37c9d0..2b730ba7 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java +++ b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java @@ -36,6 +36,7 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.RepeatStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader; import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties; import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher; import org.springframework.cloud.deployer.spi.task.TaskLauncher; @@ -46,7 +47,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; /** * @author Michael Minella @@ -70,7 +70,7 @@ public class JobConfiguration { private ConfigurableApplicationContext context; @Autowired - private ResourceLoader resourceLoader; + private DelegatingResourceLoader resourceLoader; private static final int GRID_SIZE = 4; diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index e5d9259e..001c7a3f 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -42,45 +42,43 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - maven-deploy-plugin - - true - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + maven-deploy-plugin + + true + + + diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 69f56da6..9c58c2be 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -61,7 +61,6 @@ org.springframework.cloud spring-cloud-stream-test-support - 1.0.2.RELEASE test diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherSink.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherSink.java index c07ea25e..490b0911 100644 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherSink.java +++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherSink.java @@ -20,13 +20,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader; import org.springframework.cloud.deployer.spi.core.AppDefinition; import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; import org.springframework.cloud.deployer.spi.task.TaskLauncher; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.messaging.Sink; import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.util.Assert; @@ -46,7 +46,7 @@ public class TaskLauncherSink { public TaskLauncher taskLauncher; @Autowired - private ResourceLoader resourceLoader; + private DelegatingResourceLoader resourceLoader; /** * Launches a task upon the receipt of a valid TaskLaunchRequest.