diff --git a/pom.xml b/pom.xml index 3ed27826..ddd815e8 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -109,11 +109,11 @@ - 2.2.0.RC1 - 2.0.1.RELEASE - 2.0.1.RELEASE + 2.2.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT - 2.2.0.RC1 + 2.2.0.RELEASE 1.1 8.0 diff --git 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 index 6ef2f46a..9ac7b211 100644 --- 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 diff --git 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 index 7c4fb8f6..fb943736 100644 --- 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 { diff --git 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 index 984b1ed1..6a35db2d 100644 --- 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 diff --git 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 index 84946bba..c9e9152d 100644 --- 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 { diff --git 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 index 843a3d07..4ffbdaf5 100644 --- 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 diff --git 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 index 47d42745..3b499163 100644 --- 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); } diff --git 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 index 723b1f42..0779d7fb 100644 --- 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 diff --git 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 index a3e4fc85..10386647 100644 --- 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 { diff --git 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 index f05aaf26..d65c4ac9 100644 --- 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 diff --git 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 index f460e20a..30b3f94a 100644 --- 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 { diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index f778e3cc..e37cd016 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -47,19 +47,19 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.2.0.RC1 + 2.2.0.RELEASE compile org.springframework.cloud spring-cloud-stream-binder-rabbit-test-support - 2.2.0.RC1 + 2.2.1.BUILD-SNAPSHOT test org.springframework.cloud spring-cloud-stream-test-support-internal - 2.2.0.RC1 + 2.2.1.BUILD-SNAPSHOT test diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index 3bc1dcfb..878d1930 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index b67652bf..faa73c09 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index df12099f..f9161cbb 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index b0c79fac..75f5de61 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -52,7 +52,7 @@ org.springframework.cloud spring-cloud-deployer-local - 2.0.1.RELEASE + 2.0.2.BUILD-SNAPSHOT diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 796f8ee4..cf7b52de 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -43,7 +43,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.2.0.RC1 + 2.2.0.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 49fdc482..3f9406bd 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -43,7 +43,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.2.0.RC1 + 2.2.0.RELEASE compile @@ -53,7 +53,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 2.2.0.RC1 + 2.2.1.BUILD-SNAPSHOT test diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index e72058e9..f97129ac 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT @@ -44,13 +44,13 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.2.0.RC1 + 2.2.0.RELEASE compile org.springframework.cloud spring-cloud-stream-test-support - 2.2.0.RC1 + 2.2.1.BUILD-SNAPSHOT test diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index b4bd1237..5341a15e 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT diff --git 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 index 6a96f8bf..d9821eba 100644 --- 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(), diff --git 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 index 0e45dcda..09b419bf 100644 --- 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)