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

Updated dependendencies and tests

Browse Source
This commit is contained in:
Glenn Renfro
2019-05-09 17:08:28 -04:00
parent 8f1ace5164
commit ec85e6f400
14 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.5.RELEASE</version>
<version>1.3.12.RELEASE</version>
<relativePath />
</parent>
@@ -137,12 +137,12 @@
</modules>
<properties>
<spring-cloud-stream.version>1.2.1.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.2.1.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.2.1.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream.version>1.2.2.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.2.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.2.2.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.2.1.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.2.1.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.2.1.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-cloud-deployer-resource-support.version>1.2.2.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.2.2.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-batch.version>3.0.8.RELEASE</spring-batch.version>
<commons-logging.version>1.1</commons-logging.version>
<java-ee-api.version>7.0</java-ee-api.version>

2
spring-cloud-task-docs/src/main/asciidoc/getting-started.adoc
View File

@@ -145,7 +145,7 @@ Spring Cloud Task itself:
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-core</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.4.RELEASE</version>
</dependency>
[[getting-started-writing-the-code]]

2
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java
View File

@@ -216,7 +216,7 @@ public class TaskStartTests {
Server server = null;
try {
if(defaultServer == null) {
server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort",
server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort",
String.valueOf(randomPort)).start();
defaultServer = server;
}

7
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java
View File

@@ -63,8 +63,8 @@ public class TaskLauncherSinkTests {
private final static int WAIT_INTERVAL = 500;
private final static int MAX_WAIT_TIME = 10000;
private final static String URL = "maven://io.spring.cloud:"
+ "timestamp-task:jar:1.1.0.RELEASE";
private final static String URL = "maven://org.springframework.cloud.task.app:"
+ "timestamp-task:2.0.0.RELEASE";
private final static String DATASOURCE_URL;
private final static String DATASOURCE_USER_NAME = "SA";
private final static String DATASOURCE_USER_PASSWORD = "";
@@ -102,7 +102,6 @@ public class TaskLauncherSinkTests {
properties = new HashMap<>();
properties.put("spring.datasource.url", DATASOURCE_URL);
properties.put("spring.datasource.username", DATASOURCE_USER_NAME);
properties.put("spring.datasource.password", DATASOURCE_USER_PASSWORD);
properties.put("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
properties.put("spring.application.name",TASK_NAME);
properties.put("spring.cloud.task.initialize.enable", "false");
@@ -189,7 +188,7 @@ public class TaskLauncherSinkTests {
public Server initH2TCPServer() {
Server server;
try {
server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort",
server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort",
String.valueOf(randomPort)).start();
}
catch (SQLException e) {

4
spring-cloud-task-samples/batch-events/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.2.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

2
spring-cloud-task-samples/batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/jpa-sample/pom.xml
View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java
View File

@@ -74,7 +74,7 @@ public class JpaApplicationTests {
dataSource.setPassword(DATASOURCE_USER_PASSWORD);
this.dataSource = dataSource;
try {
this.server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort))
this.server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort))
.start();
}
catch (SQLException e) {

4
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.2.2.RELEASE</version>
</dependency>
<dependency>

2
spring-cloud-task-samples/task-events/README.adoc
View File

@@ -17,7 +17,7 @@ $ ./mvnw clean install
[source,shell,indent=2]
----
$ java -jar target/task-events-1.2.2.RELEASE.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
$ java -jar target/task-events-1.2.4.RELEASE.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
----
You can listen for the events on the task-events channel with a Spring Cloud Stream Sink

2
spring-cloud-task-samples/task-events/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/taskprocessor/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.2.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

2
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/timestamp/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.20.RELEASE</version>
<relativePath />
</parent>