Updated versions for 1.3.x

This commit is contained in:
Glenn Renfro
2018-11-13 09:08:38 -05:00
parent 2ca9a38fa9
commit 68e5b43b12
10 changed files with 37 additions and 31 deletions

16
pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.10.RELEASE</version>
<version>1.3.11.RELEASE</version>
<relativePath />
</parent>
@@ -137,13 +137,13 @@
</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-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-batch.version>3.0.8.RELEASE</spring-batch.version>
<spring-cloud-stream.version>1.3.3.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.3.9.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.3.4.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.3.4.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.3.4.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-batch.version>3.0.9.RELEASE</spring-batch.version>
<commons-logging.version>1.1</commons-logging.version>
<java-ee-api.version>7.0</java-ee-api.version>
<assertj.version>3.11.0</assertj.version>

View File

@@ -13,14 +13,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.17.RELEASE</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
<spring-batch.version>3.0.8.RELEASE</spring-batch.version>
<spring-batch.version>3.0.9.RELEASE</spring-batch.version>
</properties>
<dependencyManagement>
@@ -52,19 +52,19 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@@ -13,14 +13,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.17.RELEASE</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
<spring-batch.version>3.0.8.RELEASE</spring-batch.version>
<spring-batch.version>3.0.9.RELEASE</spring-batch.version>
</properties>
<dependencyManagement>

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.17.RELEASE</version>
<relativePath />
</parent>

View File

@@ -12,14 +12,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>1.5.17.RELEASE</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
<spring-batch.version>3.0.8.RELEASE</spring-batch.version>
<spring-batch.version>3.0.9.RELEASE</spring-batch.version>
</properties>
<dependencyManagement>
@@ -48,13 +48,13 @@
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-integration</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.0.9.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.9.RELEASE</version>
</dependency>
<dependency>

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.17.RELEASE</version>
<relativePath />
</parent>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.4.RELEASE</version>
<scope>compile</scope>
</dependency>

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.17.RELEASE</version>
<relativePath />
</parent>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -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.3.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

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.17.RELEASE</version>
<relativePath />
</parent>
@@ -46,13 +46,13 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.2.1.RELEASE</version>
<version>1.3.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.3.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

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.17.RELEASE</version>
<relativePath />
</parent>

View File

@@ -108,10 +108,16 @@ public class TaskLauncherSinkTests {
assertTrue(testTaskLauncher.getApplicationName().startsWith(TASK_NAME_PREFIX));
}
@Test(expected = MessageHandlingException.class)
@Test
public void testInvalidJar() {
TaskConfiguration.TestTaskLauncher testTaskLauncher = launchTask(
INVALID_URL, null, null);
INVALID_URL, null, APP_NAME);
verifySuccessWithAppName(testTaskLauncher);
}
private void verifySuccessWithAppName(TaskConfiguration.TestTaskLauncher testTaskLauncher) {
assertEquals(LaunchState.complete, testTaskLauncher.status(DEFAULT_STATUS).getState());
assertEquals(0, testTaskLauncher.getCommandlineArguments().size());
assertEquals(APP_NAME, testTaskLauncher.getApplicationName());
}
@Test