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

Updated all dependencies for M1 RELEASE

Browse Source 
Updated to Spring Cloud Build 2.2.0.M1
This commit is contained in:
Glenn Renfro
2019-04-15 09:00:07 -04:00
parent d890835923
commit fd8ab15238
25 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>
@@ -111,11 +111,11 @@
</modules>
<properties>
<spring-cloud-stream.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-deployer.version>2.0.1.BUILD-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-deployer-local.version>2.0.1.BUILD-SNAPSHOT
<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-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>2.2.0.BUILD-SNAPSHOT
<spring-cloud-stream-binder-rabbit.version>2.2.0.RC1
</spring-cloud-stream-binder-rabbit.version>
<commons-logging.version>1.1</commons-logging.version>
<java-ee-api.version>8.0</java-ee-api.version>

2
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java
View File

@@ -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-199]",
+ "select foobarlessSEQ.nextval from dual [42001-198]",
applicationContextRunner);
}

3
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java
View File

@@ -58,6 +58,9 @@ public class TaskCoreTests {
private static final String ERROR_MESSAGE = "errorMessage='java.lang.IllegalStateException: "
+ "Failed to execute CommandLineRunner";
/**
* Used to capture the log output from the test task.
*/
@Rule
public OutputCapture outputCapture = new OutputCapture();

3
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java
View File

@@ -62,6 +62,9 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class TaskLifecycleListenerTests {
/**
* Used to capture the log output from the test task.
*/
@Rule
public OutputCapture outputCapture = new OutputCapture();

12
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskListenerExecutorObjectFactoryTests.java
View File

@@ -51,12 +51,24 @@ import static org.assertj.core.api.Assertions.assertThat;
@DirtiesContext
public class TaskListenerExecutorObjectFactoryTests {
/**
* Task name constant for the Before TaskListener tests.
*/
public static final String BEFORE_LISTENER = "BEFORE LISTENER";
/**
* Task name constant for the After TaskListener tests.
*/
public static final String AFTER_LISTENER = "AFTER LISTENER";
/**
* Task name constant for the Fail TaskListener tests.
*/
public static final String FAIL_LISTENER = "FAIL LISTENER";
/**
* Collection of the task execution listeners that were fired.
*/
public static List<TaskExecution> taskExecutionListenerResults = new ArrayList<>(3);
@Autowired

3
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java
View File

@@ -65,6 +65,9 @@ public class SimpleTaskExplorerTests {
private final static String EXTERNAL_EXECUTION_ID = "123ABC";
/**
* Establishes that a Exception is not expected.
*/
@Rule
public ExpectedException expected = ExpectedException.none();

3
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/TaskDatabaseInitializerTests.java
View File

@@ -43,6 +43,9 @@ import static org.mockito.Mockito.mock;
*/
public class TaskDatabaseInitializerTests {
/**
* Establishes that a Exception is not expected.
*/
@Rule
public ExpectedException expected = ExpectedException.none();

6
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TaskExecutionCreator.java
View File

@@ -28,7 +28,10 @@ import org.springframework.cloud.task.repository.TaskRepository;
*
* @author Glenn Renfro
*/
public class TaskExecutionCreator {
public final class TaskExecutionCreator {
private TaskExecutionCreator() {
}
/**
* Creates a sample TaskExecution and stores it in the taskRepository.
@@ -71,6 +74,7 @@ public class TaskExecutionCreator {
/**
* Updates a sample TaskExecution in the taskRepository.
* @param taskRepository the taskRepository where the taskExecution should be updated.
* @param expectedTaskExecution the expected task execution.
* @return the taskExecution created.
*/
public static TaskExecution completeExecution(TaskRepository taskRepository,

5
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestDBUtils.java
View File

@@ -52,7 +52,10 @@ import static org.mockito.Mockito.when;
* @author Glenn Renfro
* @author Ilayaperumal Gopinathan
*/
public class TestDBUtils {
public final class TestDBUtils {
private TestDBUtils() {
}
/**
* Retrieves the TaskExecution from the datasource.

11
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestListener.java
View File

@@ -25,10 +25,19 @@ import org.springframework.cloud.task.repository.TaskExecution;
*/
public abstract class TestListener {
/**
* Default end message to use for the start message.
*/
public static final String START_MESSAGE = "FOO";
/**
* Default end message to use for the error message.
*/
public static final String ERROR_MESSAGE = "BAR";
/**
* Default end message to use for the end message.
*/
public static final String END_MESSAGE = "BAZ";
protected boolean isTaskStartup;
@@ -67,6 +76,7 @@ public abstract class TestListener {
/**
* Task Execution that was updated during listener call.
* @return instance of TaskExecution.
*/
public TaskExecution getTaskExecution() {
return this.taskExecution;
@@ -74,6 +84,7 @@ public abstract class TestListener {
/**
* The throwable that was sent with the task if task failed.
* @return instance of Throwable.
*/
public Throwable getThrowable() {
return this.throwable;

17
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java
View File

@@ -42,10 +42,16 @@ import static org.mockito.Mockito.when;
*
* @author Glenn Renfro
*/
public class TestVerifierUtils {
public final class TestVerifierUtils {
/**
* The default number of arguments to use for the test TaskExecutions.
*/
public static final int ARG_SIZE = 5;
private TestVerifierUtils() {
}
/**
* Creates a mock {@link Appender} to be added to the root logger.
* @return reference to the mock appender.
@@ -78,7 +84,7 @@ public class TestVerifierUtils {
/**
* Creates a fully populated TaskExecution (except args) for testing.
* @return
* @return instance of a TaskExecution
*/
public static TaskExecution createSampleTaskExecutionNoArg() {
Random randomGenerator = new Random();
@@ -92,7 +98,7 @@ public class TestVerifierUtils {
/**
* Creates a fully populated TaskExecution (except args) for testing.
* @return
* @return instance of a TaskExecution.
*/
public static TaskExecution endSampleTaskExecutionNoArg() {
Random randomGenerator = new Random();
@@ -109,7 +115,8 @@ public class TestVerifierUtils {
/**
* Creates a fully populated TaskExecution for testing.
* @return
* @param executionId the taskExecutionId to be created.
* @return instance of the TaskExecution.
*/
public static TaskExecution createSampleTaskExecution(long executionId) {
Date startTime = new Date();
@@ -124,7 +131,7 @@ public class TestVerifierUtils {
}
/**
* Verifies that all the fields in between the expected and actual are the same;
* Verifies that all the fields in between the expected and actual are the same.
* @param expectedTaskExecution The expected value for the task execution.
* @param actualTaskExecution The actual value for the task execution.
*/

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

@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>
@@ -49,19 +49,19 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>test</scope>
</dependency>
<dependency>

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

@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>

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

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>

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

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

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

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>

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

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>

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

@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>

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

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>test</scope>
</dependency>
<dependency>

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

@@ -17,7 +17,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>
@@ -46,13 +46,13 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.RC1</version>
<scope>test</scope>
</dependency>
<dependency>

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

@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.0.M1</version>
<relativePath/>
</parent>

4
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobInstanceEventTests.java
View File

@@ -27,9 +27,9 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class JobInstanceEventTests {
public static final long INSTANCE_ID = 1;
private static final long INSTANCE_ID = 1;
public static final String JOB_NAME = "FOOBAR";
private static final String JOB_NAME = "FOOBAR";
@Test
public void testConstructor() {

4
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchRequestTests.java
View File

@@ -31,9 +31,9 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class TaskLaunchRequestTests {
public static final String URI = "https://myURI";
private static final String URI = "https://myURI";
public static final String APP_NAME = "MY_APP_NAME";
private static final String APP_NAME = "MY_APP_NAME";
@Test
public void testEquals() {

2
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java
View File

@@ -40,7 +40,7 @@ public class TaskConfiguration {
public static class TestTaskLauncher implements TaskLauncher {
public static final String LAUNCH_ID = "TEST_LAUNCH_ID";
private static final String LAUNCH_ID = "TEST_LAUNCH_ID";
private LaunchState state = LaunchState.unknown;

2
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/util/TaskLauncherSinkApplication.java
View File

@@ -23,6 +23,7 @@ import org.springframework.cloud.task.launcher.annotation.EnableTaskLauncher;
/**
* @author Glenn Renfro
*/
// @checkstyle:on
@SpringBootApplication
@EnableTaskLauncher
public class TaskLauncherSinkApplication {
@@ -32,3 +33,4 @@ public class TaskLauncherSinkApplication {
}
}
// @checkstyle:off