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

Updated version numbers

Browse Source 
Reset the ResourceLoader to DeploymentResourceLoader
Adjusted the poms to not run deploy for Samples as well as integration tests
Used default constructor
This commit is contained in:
Glenn Renfro
2016-07-07 17:40:20 -04:00
committed by Michael Minella
parent 02589b1b2d
commit 761df8a598
8 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.adoc
View File

@@ -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]

14
pom.xml
View File

@@ -71,6 +71,8 @@
<module>spring-cloud-task-batch</module>
<module>spring-cloud-task-stream</module>
<module>spring-cloud-task-starter</module>
<module>spring-cloud-task-integration-tests</module>
<module>spring-cloud-task-samples</module>
</modules>
<properties>
@@ -218,17 +220,5 @@
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>samples</id>
<modules>
<module>spring-cloud-task-samples</module>
</modules>
</profile>
<profile>
<id>integration-test</id>
<modules>
<module>spring-cloud-task-integration-tests</module>
</modules>
</profile>
</profiles>
</project>

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

@@ -16,11 +16,11 @@
<properties>
<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-local.version>
<spring-cloud-deployer-spi.version>1.0.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.2.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.0.2.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-resource-maven.version>
<spring-cloud-deployer-resource-support.version>1.0.2.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.0.2.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
</properties>
<dependencyManagement>
@@ -87,6 +87,11 @@
<artifactId>spring-batch-core</artifactId>
<version>${spring-batch.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

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

@@ -46,4 +46,15 @@
<artifactId>spring-cloud-deployer-resource-support</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

4
spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java
View File

@@ -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;

78
spring-cloud-task-samples/pom.xml
View File

@@ -42,45 +42,43 @@
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

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

@@ -61,7 +61,6 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

4
spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherSink.java
View File

@@ -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.