Update dependency versions

2019-05-07 13:54:00 -04:00
parent f7baf172ec
commit 16f68020fb
22 changed files with 68 additions and 52 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -109,11 +109,11 @@
 	</modules>

 	<properties>
-		<spring-cloud-stream.version>2.2.0.RC1</spring-cloud-stream.version>
-		<spring-cloud-deployer.version>2.0.1.RELEASE</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>2.0.1.RELEASE
+		<spring-cloud-stream.version>2.2.1.BUILD-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-deployer.version>2.0.2.BUILD-SNAPSHOT</spring-cloud-deployer.version>
+		<spring-cloud-deployer-local.version>2.0.2.BUILD-SNAPSHOT
 		</spring-cloud-deployer-local.version>
-		<spring-cloud-stream-binder-rabbit.version>2.2.0.RC1
+		<spring-cloud-stream-binder-rabbit.version>2.2.0.RELEASE
 		</spring-cloud-stream-binder-rabbit.version>
 		<commons-logging.version>1.1</commons-logging.version>
 		<java-ee-api.version>8.0</java-ee-api.version>
--- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
+++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
@@ -40,8 +40,10 @@ import org.springframework.context.annotation.Configuration;
 */
@Configuration
@ConditionalOnBean({ Job.class })
-@ConditionalOnProperty(name = { "spring.cloud.task.batch.listener.enable",
-		"spring.cloud.task.batch.listener.enabled" }, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(
+		name = { "spring.cloud.task.batch.listener.enable",
+				"spring.cloud.task.batch.listener.enabled" },
+		havingValue = "true", matchIfMissing = true)
 public class TaskBatchAutoConfiguration {

 	@Bean
--- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java
+++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java
@@ -38,7 +38,8 @@ import org.springframework.context.annotation.Configuration;
 * @author Glenn Renfro
 */
@Configuration
-@ConditionalOnProperty(name = "spring.cloud.task.batch.fail-on-job-failure", havingValue = "true")
+@ConditionalOnProperty(name = "spring.cloud.task.batch.fail-on-job-failure",
+		havingValue = "true")
@EnableConfigurationProperties(TaskBatchProperties.class)
@AutoConfigureBefore(BatchAutoConfiguration.class)
 public class TaskJobLauncherAutoConfiguration {
--- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerCoreTests.java
+++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerCoreTests.java
@@ -59,8 +59,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 * @author Glenn Renfro
 */
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {
-		TaskJobLauncherCommandLineRunnerCoreTests.BatchConfiguration.class })
+@ContextConfiguration(
+		classes = { TaskJobLauncherCommandLineRunnerCoreTests.BatchConfiguration.class })
 public class TaskJobLauncherCommandLineRunnerCoreTests {

 	@Autowired
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java
@@ -55,7 +55,8 @@ import org.springframework.util.CollectionUtils;
@EnableTransactionManagement
@EnableConfigurationProperties(TaskProperties.class)
 // @checkstyle:off
-@ConditionalOnProperty(prefix = "spring.cloud.task.autoconfiguration", name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.cloud.task.autoconfiguration", name = "enabled",
+		havingValue = "true", matchIfMissing = true)
 // @checkstyle:on
 public class SimpleTaskAutoConfiguration {

--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java
@@ -35,7 +35,8 @@ import org.springframework.integration.support.locks.PassThruLockRegistry;

@Order(Ordered.HIGHEST_PRECEDENCE)
@Configuration
-@ConditionalOnProperty(prefix = "spring.cloud.task", name = "single-instance-enabled", havingValue = "true")
+@ConditionalOnProperty(prefix = "spring.cloud.task", name = "single-instance-enabled",
+		havingValue = "true")
 public class SingleTaskConfiguration {

 	@Autowired
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java
@@ -131,7 +131,7 @@ public class SimpleTaskAutoConfigurationTests {
 						+ "Could not obtain sequence value; nested exception is org.h2.jdbc.JdbcSQLSyntaxErrorException: "
 						+ "Syntax error in SQL statement \"SELECT FOOBARLESSSEQ.NEXTVAL FROM[*] DUAL \"; "
 						+ "expected \"identifier\"; SQL statement:\n"
-						+ "select foobarlessSEQ.nextval from dual [42001-198]",
+						+ "select foobarlessSEQ.nextval from dual [42001-199]",
 				applicationContextRunner);
 	}

--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskRepositoryInitializerNoDataSourceTaskConfigurerTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskRepositoryInitializerNoDataSourceTaskConfigurerTests.java
@@ -44,9 +44,9 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 * @since 2.0.0
 */
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { SimpleTaskAutoConfiguration.class,
-		SingleTaskConfiguration.class, EmbeddedDataSourceConfiguration.class,
-		DefaultTaskConfigurer.class })
+@ContextConfiguration(
+		classes = { SimpleTaskAutoConfiguration.class, SingleTaskConfiguration.class,
+				EmbeddedDataSourceConfiguration.class, DefaultTaskConfigurer.class })
 public class TaskRepositoryInitializerNoDataSourceTaskConfigurerTests {

 	@Autowired
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/TaskPropertiesTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/TaskPropertiesTests.java
@@ -46,10 +46,10 @@ public class TaskPropertiesTests {
 	}

 	@RunWith(SpringRunner.class)
-	@SpringBootTest(classes = { TaskPropertiesTests.Config.class,
-			SimpleTaskAutoConfiguration.class,
-			SingleTaskConfiguration.class }, properties = {
-					"spring.cloud.task.closecontextEnabled=false" })
+	@SpringBootTest(
+			classes = { TaskPropertiesTests.Config.class,
+					SimpleTaskAutoConfiguration.class, SingleTaskConfiguration.class },
+			properties = { "spring.cloud.task.closecontextEnabled=false" })
 	@DirtiesContext
 	public static class CloseContextEnabledTest extends TaskPropertiesTests {

--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDaoTests.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDaoTests.java
@@ -53,9 +53,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Gunnar Hillert
 */
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = { TestConfiguration.class,
-		EmbeddedDataSourceConfiguration.class,
-		PropertyPlaceholderAutoConfiguration.class })
+@ContextConfiguration(
+		classes = { TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class })
 public class JdbcTaskExecutionDaoTests extends BaseTaskExecutionDaoTestCases {

 	@Autowired
--- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java
+++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java
@@ -58,8 +58,10 @@ import org.springframework.util.SocketUtils;
 import static org.assertj.core.api.Assertions.assertThat;

@RunWith(SpringRunner.class)
-@SpringBootTest(classes = { TaskLauncherSinkApplication.class,
-		TaskLauncherSinkTests.TaskLauncherConfiguration.class }, properties = {
+@SpringBootTest(
+		classes = { TaskLauncherSinkApplication.class,
+				TaskLauncherSinkTests.TaskLauncherConfiguration.class },
+		properties = {
 				"maven.remote-repositories.repo1.url=https://repo.spring.io/libs-release" })
 public class TaskLauncherSinkTests {

--- a/spring-cloud-task-samples/batch-events/pom.xml
+++ b/spring-cloud-task-samples/batch-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -47,19 +47,19 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.0.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.1.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.1.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
--- a/spring-cloud-task-samples/batch-job/pom.xml
+++ b/spring-cloud-task-samples/batch-job/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/spring-cloud-task-samples/jpa-sample/pom.xml
+++ b/spring-cloud-task-samples/jpa-sample/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/spring-cloud-task-samples/multiple-datasources/pom.xml
+++ b/spring-cloud-task-samples/multiple-datasources/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml
+++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-local</artifactId>
-			<version>2.0.1.RELEASE</version>
+			<version>2.0.2.BUILD-SNAPSHOT</version>
 		</dependency>

 		<dependency>
--- a/spring-cloud-task-samples/task-events/pom.xml
+++ b/spring-cloud-task-samples/task-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.0.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
--- a/spring-cloud-task-samples/taskprocessor/pom.xml
+++ b/spring-cloud-task-samples/taskprocessor/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.0.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.1.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.0.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support</artifactId>
-			<version>2.2.0.RC1</version>
+			<version>2.2.1.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
--- a/spring-cloud-task-samples/timestamp/pom.xml
+++ b/spring-cloud-task-samples/timestamp/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M1</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java
+++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java
@@ -64,7 +64,8 @@ import org.springframework.messaging.MessageChannel;
@ConditionalOnClass(Job.class)
@ConditionalOnBean({ Job.class, TaskLifecycleListener.class })
 // @checkstyle:off
-@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events", name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events", name = "enabled",
+		havingValue = "true", matchIfMissing = true)
 // @checkstyle:on
@AutoConfigureAfter(SimpleTaskAutoConfiguration.class)
 public class BatchEventAutoConfiguration {
@@ -192,7 +193,8 @@ public class BatchEventAutoConfiguration {
 		// @checkstyle:off
 		@Bean
 		@Lazy
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.job-execution", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.job-execution",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public JobExecutionListener jobExecutionEventsListener() {
 			return new EventEmittingJobExecutionListener(
@@ -202,7 +204,8 @@ public class BatchEventAutoConfiguration {

 		// @checkstyle:off
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.step-execution", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.step-execution",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public StepExecutionListener stepExecutionEventsListener() {
 			return new EventEmittingStepExecutionListener(
@@ -213,7 +216,8 @@ public class BatchEventAutoConfiguration {
 		// @checkstyle:off
 		@Bean
 		@Lazy
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.chunk", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.chunk",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public EventEmittingChunkListener chunkEventsListener() {
 			return new EventEmittingChunkListener(this.listenerChannels.chunkEvents(),
@@ -222,7 +226,8 @@ public class BatchEventAutoConfiguration {

 		// @checkstyle:off
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-read", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-read",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public ItemReadListener itemReadEventsListener() {
 			return new EventEmittingItemReadListener(
@@ -232,7 +237,8 @@ public class BatchEventAutoConfiguration {

 		// @checkstyle:off
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-write", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-write",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public ItemWriteListener itemWriteEventsListener() {
 			return new EventEmittingItemWriteListener(
@@ -242,7 +248,8 @@ public class BatchEventAutoConfiguration {

 		// @checkstyle:off
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-process", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-process",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public ItemProcessListener itemProcessEventsListener() {
 			return new EventEmittingItemProcessListener(
@@ -252,7 +259,8 @@ public class BatchEventAutoConfiguration {

 		// @checkstyle:off
 		@Bean
-		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.skip", name = "enabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.skip",
+				name = "enabled", havingValue = "true", matchIfMissing = true)
 		// @checkstyle:on
 		public SkipListener skipEventsListener() {
 			return new EventEmittingSkipListener(this.listenerChannels.skipEvents(),
--- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java
+++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java
@@ -38,7 +38,8 @@ import org.springframework.messaging.MessageChannel;
@ConditionalOnClass(EnableBinding.class)
@ConditionalOnBean(TaskLifecycleListener.class)
 // @checkstyle:off
-@ConditionalOnProperty(prefix = "spring.cloud.task.events", name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.cloud.task.events", name = "enabled",
+		havingValue = "true", matchIfMissing = true)
 // @checkstyle:on
@PropertySource("classpath:/org/springframework/cloud/task/application.properties")
@AutoConfigureBefore(BindingServiceConfiguration.class)