diff --git a/pom.xml b/pom.xml index 857ae3c2..90388a8e 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 1.3.3.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom Spring Cloud Task Build Spring Cloud Task Build @@ -137,13 +137,13 @@ - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.0.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 3.0.7.RELEASE + 2.0.0.BUILD-SNAPSHOT + 1.2.0.RELEASE + 1.2.0.RELEASE + 2.0.0.BUILD-SNAPSHOT + 1.2.0.RELEASE + 1.2.0.RELEASE + 4.0.0.BUILD-SNAPSHOT 1.1 7.0 diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 347459b6..59e21406 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index 510d8091..9ffaf1db 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-task-batch diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java index d2f27a24..5f21974b 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java @@ -78,7 +78,7 @@ public class TaskBatchExecutionListenerTests { @Test public void testAutobuiltDataSource() { - this.applicationContext = SpringApplication.run(new Object[] {JobConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[] {JobConfiguration.class, PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, @@ -88,7 +88,7 @@ public class TaskBatchExecutionListenerTests { @Test public void testFactoryBean() { - this.applicationContext = SpringApplication.run(new Object[]{JobFactoryBeanConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[]{JobFactoryBeanConfiguration.class, PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, @@ -109,7 +109,7 @@ public class TaskBatchExecutionListenerTests { } @Test public void testMultipleDataSources() { - this.applicationContext = SpringApplication.run(new Object[] {JobConfigurationMultipleDataSources.class, + this.applicationContext = SpringApplication.run(new Class[] {JobConfigurationMultipleDataSources.class, PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, @@ -127,7 +127,7 @@ public class TaskBatchExecutionListenerTests { @Test public void testAutobuiltDataSourceNoJob() { - this.applicationContext = SpringApplication.run(new Object[] {NoJobConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[] {NoJobConfiguration.class, PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, @@ -135,7 +135,7 @@ public class TaskBatchExecutionListenerTests { TaskExplorer taskExplorer = this.applicationContext.getBean(TaskExplorer.class); - Page page = taskExplorer.findTaskExecutionsByName("application", new PageRequest(0, 1)); + Page page = taskExplorer.findTaskExecutionsByName("application", PageRequest.of(0, 1)); Set jobExecutionIds = taskExplorer.getJobExecutionIdsByTaskExecutionId(page.iterator().next().getExecutionId()); @@ -144,38 +144,38 @@ public class TaskBatchExecutionListenerTests { @Test public void testMapBased() { - this.applicationContext = SpringApplication.run(new Object[] {JobConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[] {JobConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, TaskBatchAutoConfiguration.class}, ARGS); TaskExplorer taskExplorer = this.applicationContext.getBean(TaskExplorer.class); - Page page = taskExplorer.findTaskExecutionsByName("application", new PageRequest(0, 1)); + Page page = taskExplorer.findTaskExecutionsByName("application", PageRequest.of(0, 1)); Set jobExecutionIds = taskExplorer.getJobExecutionIdsByTaskExecutionId(page.iterator().next().getExecutionId()); assertEquals(1, jobExecutionIds.size()); - assertEquals(0, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIds.iterator().next())); + assertEquals(1, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIds.iterator().next())); } @Test public void testMultipleJobs() { - this.applicationContext = SpringApplication.run(new Object[] {MultipleJobConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[] {EmbeddedDataSourceConfiguration.class, MultipleJobConfiguration.class, PropertyPlaceholderAutoConfiguration.class, BatchAutoConfiguration.class, TaskBatchAutoConfiguration.class}, ARGS); TaskExplorer taskExplorer = this.applicationContext.getBean(TaskExplorer.class); - Page page = taskExplorer.findTaskExecutionsByName("application", new PageRequest(0, 1)); + Page page = taskExplorer.findTaskExecutionsByName("application", PageRequest.of(0, 1)); Set jobExecutionIds = taskExplorer.getJobExecutionIdsByTaskExecutionId(page.iterator().next().getExecutionId()); assertEquals(2, jobExecutionIds.size()); Iterator jobExecutionIdsIterator = jobExecutionIds.iterator(); - assertEquals(0, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())); - assertEquals(0, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())); + assertEquals(1, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())); + assertEquals(1, (long) taskExplorer.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())); } @Test @@ -214,8 +214,8 @@ public class TaskBatchExecutionListenerTests { private TaskBatchExecutionListenerBeanPostProcessor beanPostProcessor( List jobNames) { - this.applicationContext = SpringApplication.run(new Object[] {JobConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, + this.applicationContext = SpringApplication.run(new Class[] {JobConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, BatchAutoConfiguration.class, TaskBatchAutoConfiguration.class}, ARGS); diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 6d9c56f5..efa1f70c 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-task-core diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/MapTaskExecutionDao.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/MapTaskExecutionDao.java index 833e73a7..4c67ceda 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/MapTaskExecutionDao.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/MapTaskExecutionDao.java @@ -245,10 +245,10 @@ public class MapTaskExecutionDao implements TaskExecutionDao { } private Page getPageFromList(List executionList, Pageable pageable, long maxSize){ - int toIndex = (pageable.getOffset() + pageable.getPageSize() > executionList.size()) ? + long toIndex = (pageable.getOffset() + pageable.getPageSize() > executionList.size()) ? executionList.size() : pageable.getOffset() + pageable.getPageSize(); return new PageImpl<>( - executionList.subList(pageable.getOffset(), toIndex), + executionList.subList((int)pageable.getOffset(), (int)toIndex), pageable, maxSize); } } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/Db2PagingQueryProvider.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/Db2PagingQueryProvider.java index 9b657e07..917f8d7f 100755 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/Db2PagingQueryProvider.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/Db2PagingQueryProvider.java @@ -28,7 +28,7 @@ public class Db2PagingQueryProvider extends AbstractSqlPagingQueryProvider { @Override public String getPageQuery(Pageable pageable) { - int offset = pageable.getOffset() + 1; + long offset = pageable.getOffset() + 1; return generateRowNumSqlQueryWithNesting(getSelectClause(), false, "TMP_ROW_NUM BETWEEN " + offset + " AND " + (offset + pageable.getPageSize())); } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/OraclePagingQueryProvider.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/OraclePagingQueryProvider.java index f0b3ec6b..5ab1c9dc 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/OraclePagingQueryProvider.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/OraclePagingQueryProvider.java @@ -28,7 +28,7 @@ public class OraclePagingQueryProvider extends AbstractSqlPagingQueryProvider { @Override public String getPageQuery(Pageable pageable) { - int offset = pageable.getOffset()+1; + long offset = pageable.getOffset()+1; return generateRowNumSqlQueryWithNesting(getSelectClause(), false, "TMP_ROW_NUM >= " + offset + " AND TMP_ROW_NUM < " + (offset+pageable.getPageSize())); } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlServerPagingQueryProvider.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlServerPagingQueryProvider.java index dc4cea0d..3818b9bf 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlServerPagingQueryProvider.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlServerPagingQueryProvider.java @@ -27,7 +27,7 @@ public class SqlServerPagingQueryProvider extends AbstractSqlPagingQueryProvider @Override public String getPageQuery(Pageable pageable) { - int offset = pageable.getOffset()+1; + long offset = pageable.getOffset()+1; return generateRowNumSqlQueryWithNesting(getSelectClause(), false, "TMP_ROW_NUM >= " + offset + " AND TMP_ROW_NUM < " + (offset+pageable.getPageSize())); } diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskConfigurationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskConfigurationTests.java index d2b01387..38f2f837 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskConfigurationTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskConfigurationTests.java @@ -17,7 +17,6 @@ package org.springframework.cloud.task; import java.util.Properties; - import javax.sql.DataSource; import org.junit.After; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java index b7cdd5ca..95e2eb40 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java @@ -5,7 +5,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.rule.OutputCapture; import org.springframework.cloud.task.configuration.EnableTask; @@ -48,7 +48,7 @@ public class TaskCoreTests { @Test public void successfulTaskTest() { - applicationContext = new SpringApplicationBuilder().sources(new Object[]{TaskConfiguration.class, + applicationContext = new SpringApplicationBuilder().sources(new Class[]{TaskConfiguration.class, PropertyPlaceholderAutoConfiguration.class}).build().run(new String[]{ "--spring.cloud.task.closecontext.enable=false", "--spring.cloud.task.name=" + TASK_NAME, @@ -67,8 +67,8 @@ public class TaskCoreTests { public void exceptionTaskTest() { boolean exceptionFired = false; try { - applicationContext = new SpringApplicationBuilder().sources(new Object[]{TaskExceptionConfiguration.class, - PropertyPlaceholderAutoConfiguration.class}).build().run(new String[]{ + applicationContext = new SpringApplicationBuilder().sources(TaskExceptionConfiguration.class, + PropertyPlaceholderAutoConfiguration.class).build().run(new String[]{ "--spring.cloud.task.closecontext.enable=false", "--spring.cloud.task.name=" + TASK_NAME, "--spring.main.web-environment=false"}); @@ -95,8 +95,8 @@ public class TaskCoreTests { public void invalidExecutionId() { boolean exceptionFired = false; try { - applicationContext = new SpringApplicationBuilder().sources(new Object[]{TaskExceptionConfiguration.class, - PropertyPlaceholderAutoConfiguration.class}).build().run(new String[]{ + applicationContext = new SpringApplicationBuilder().sources(TaskExceptionConfiguration.class, + PropertyPlaceholderAutoConfiguration.class).build().run(new String[]{ "--spring.cloud.task.closecontext.enable=false", "--spring.cloud.task.name=" + TASK_NAME, "--spring.main.web-environment=false", diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskExecutionListenerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskExecutionListenerTests.java index ddfa0ab6..6cbfafbb 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskExecutionListenerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskExecutionListenerTests.java @@ -23,7 +23,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.cloud.task.listener.annotation.AfterTask; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java index 8d08205b..ada8da46 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java @@ -30,11 +30,10 @@ import org.junit.Test; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ExitCodeEvent; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.cloud.task.configuration.TaskProperties; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.cloud.task.repository.TaskExplorer; import org.springframework.cloud.task.util.TestDefaultConfiguration; @@ -139,7 +138,7 @@ public class TaskLifecycleListenerTests { @Test public void testNoClosingOfContext() { - ConfigurableApplicationContext applicationContext = SpringApplication.run(new Object[] {TestDefaultConfiguration.class, PropertyPlaceholderAutoConfiguration.class}, + ConfigurableApplicationContext applicationContext = SpringApplication.run(new Class[]{TestDefaultConfiguration.class, PropertyPlaceholderAutoConfiguration.class}, new String[] {"--spring.cloud.task.closecontext_enable=false"}); try { 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 8304d195..44f1ebb3 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 @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.cloud.task.configuration.TestConfiguration; import org.springframework.cloud.task.repository.TaskExecution; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java index a8a5e2a1..d42d9095 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java @@ -44,7 +44,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.cloud.task.configuration.TestConfiguration; import org.springframework.cloud.task.repository.TaskExecution; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java index 74b0c15d..caa30426 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.cloud.task.configuration.SimpleTaskConfiguration; import org.springframework.cloud.task.repository.TaskExecution; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/TaskDatabaseInitializerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/TaskDatabaseInitializerTests.java index 2227b59f..b758ab6f 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/TaskDatabaseInitializerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/TaskDatabaseInitializerTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.cloud.task.configuration.SimpleTaskConfiguration; import org.springframework.cloud.task.configuration.TestConfiguration; diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 803322d5..1b23067f 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -19,22 +19,22 @@ org.springframework.cloud spring-cloud-starter-task - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-task-core - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-task-batch - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-task-stream - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-task-docs/pom.xml b/spring-cloud-task-docs/pom.xml index 2c07d876..8645e9ba 100644 --- a/spring-cloud-task-docs/pom.xml +++ b/spring-cloud-task-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-task-docs Spring Cloud Task Docs diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 5686c5f5..30dddead 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT 4.0.0 Spring Cloud Task Integration Tests diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java index e6facd04..a0257c6b 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.springframework.batch.core.scope.context.ChunkContext; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; @@ -248,8 +249,8 @@ public class BatchExecutionEventTests { } } - private Object[] getConfigurations(Class sinkClazz, Class jobConfigurationClazz) { - return new Object[]{ + private Class[] getConfigurations(Class sinkClazz, Class jobConfigurationClazz) { + return new Class[]{PropertyPlaceholderAutoConfiguration.class, jobConfigurationClazz, sinkClazz }; } diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index e7601fb5..de93c7d8 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -59,7 +59,7 @@ public class TaskEventTests { @Test public void testTaskEventListener() throws Exception { - ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder().sources(new Object[] {TaskEventsConfiguration.class, + ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder().sources(new Class[] {TaskEventsConfiguration.class, TaskEventAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, RabbitServiceAutoConfiguration.class}).build().run(new String[] {"--spring.cloud.task.closecontext_enable=false", diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 3d160c9d..18ccb2ca 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud batch-events - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar Batch Events Sample Application @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index 80262173..e6558263 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -5,7 +5,7 @@ io.spring.cloud batch-job jar - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Cloud Task Batch Example Batch Job Sample Application @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index d7a0880f..c746ec10 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 5ee77456..1789e1e6 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 2c4194ba..13381c9b 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 64d490d4..2f61c78f 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 38556106..d81af064 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-task-dependencies - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 1a049feb..0eb62210 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 1.2.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java index 0a3b92e7..d5b302c2 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java @@ -35,7 +35,8 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; + +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.cloud.task.batch.listener.support.JobInstanceEvent; @@ -275,7 +276,7 @@ public class JobExecutionEventTests { @Test public void testOrderConfiguration() { ConfigurableApplicationContext applicationContext = - SpringApplication.run(new Object[]{BatchEventAutoConfiguration.JobExecutionListenerConfiguration.class, + SpringApplication.run(new Class[]{BatchEventAutoConfiguration.JobExecutionListenerConfiguration.class, EventJobExecutionConfiguration.class, PropertyPlaceholderAutoConfiguration.class, TestSupportBinderAutoConfiguration.class}, @@ -299,7 +300,7 @@ public class JobExecutionEventTests { boolean exceptionThrown = false; String disabledPropertyArg = (property != null) ? "--" + property + "=false" : ""; ConfigurableApplicationContext applicationContext = - SpringApplication.run(new Object[]{BatchEventAutoConfiguration.JobExecutionListenerConfiguration.class, + SpringApplication.run(new Class[]{BatchEventAutoConfiguration.JobExecutionListenerConfiguration.class, EventJobExecutionConfiguration.class, PropertyPlaceholderAutoConfiguration.class, TestSupportBinderAutoConfiguration.class}, diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index cf5e60f9..318e41a6 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -18,7 +18,8 @@ package org.springframework.cloud.task.listener; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.ConfigurableApplicationContext; @@ -38,9 +39,8 @@ public class TaskEventTests { @Test public void testDefaultConfiguration() { ConfigurableApplicationContext applicationContext = - SpringApplication.run(new Object[]{ TaskEventsConfiguration.class, + SpringApplication.run(new Class[]{PropertyPlaceholderAutoConfiguration.class,EmbeddedDataSourceConfiguration.class,TaskEventsConfiguration.class, TaskEventAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, TestSupportBinderAutoConfiguration.class}, new String[]{ "--spring.cloud.task.closecontext_enable=false", "--spring.main.web-environment=false"});