Upgrade to Spring Boot 1.4

This commit upgraded all places where Spring Cloud Task explicitly
references Spring Boot 1.4

Resolves spring-cloud/spring-cloud-task#166

Updated the jar version numbers in the adocs to 1.1.0

spring-cloud-task-samples/batch-events/README.adoc

@@ -27,7 +27,7 @@ $ ./mvnw clean install
 
 [source,shell,indent=2]
 ----
-$ java -jar target/batch-events-1.0.3.BUILD-SNAPSHOT.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json
+$ java -jar target/batch-events-1.1.0.BUILD-SNAPSHOT.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json
 ----
 
 For example you can listen for specific job execution events on a specified channel with a Spring Cloud Stream Sink

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>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -61,6 +61,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-task-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>

spring-cloud-task-samples/batch-job/README.adoc

@@ -22,5 +22,5 @@ $ mvn clean package
 
 [source,shell,indent=2]
 ----
-$ java -jar target/batch-job-1.0.3.BUILD-SNAPSHOT.jar
+$ java -jar target/batch-job-1.1.0.BUILD-SNAPSHOT.jar
 ----

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>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>

spring-cloud-task-samples/partitioned-batch-job/README.adoc

@@ -22,7 +22,7 @@ $ export spring_datasource_url=jdbc:mysql://localhost:3306/<your database>
 $ export spring_datasource_username=<your username>
 $ export spring_datasource_password=<your password>
 $ export spring_datasource_driverClassName=org.mariadb.jdbc.Driver
-$ java -jar -Dspring.profiles.active=master target/partitioned-batch-job-1.0.3.BUILD-SNAPSHOT.jar
+$ java -jar -Dspring.profiles.active=master target/partitioned-batch-job-1.1.0.BUILD-SNAPSHOT.jar
 ----
 
 NOTE: This example will use require a MySql RDBMS repository and currently uses the mariadb jdbc driver to connect.

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>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>

spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.task.partitioner;
+
+import java.sql.SQLException;
+import javax.sql.DataSource;
+
+import io.spring.PartitionedBatchJobApplication;
+import org.h2.tools.Server;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.task.repository.TaskExecution;
+import org.springframework.cloud.task.repository.TaskExplorer;
+import org.springframework.cloud.task.repository.support.SimpleTaskExplorer;
+import org.springframework.cloud.task.repository.support.TaskExecutionDaoFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.SocketUtils;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = {TaskPartitionerTests.TaskLauncherConfiguration.class})
+public class TaskPartitionerTests {
+
+	private static String DATASOURCE_URL;
+	private final static String DATASOURCE_USER_NAME = "SA";
+	private final static String DATASOURCE_USER_PASSWORD = "";
+	private final static String DATASOURCE_DRIVER_CLASS_NAME = "org.h2.Driver";
+
+	private TaskExplorer taskExplorer;
+
+	@Autowired
+	private DataSource dataSource;
+
+	@Autowired
+	public void setDataSource(DataSource dataSource) {
+		taskExplorer = new SimpleTaskExplorer(new TaskExecutionDaoFactoryBean(dataSource));
+	}
+
+	private static int randomPort;
+
+	static {
+		randomPort = SocketUtils.findAvailableTcpPort();
+		DATASOURCE_URL = "jdbc:h2:tcp://localhost:" + randomPort + "/mem:dataflow;DB_CLOSE_DELAY=-1;"
+				+ "DB_CLOSE_ON_EXIT=FALSE";
+	}
+
+	@Before
+	public void setup() {
+		JdbcTemplate template = new JdbcTemplate(this.dataSource);
+		template.execute("DROP TABLE IF EXISTS TASK_TASK_BATCH");
+		template.execute("DROP TABLE IF EXISTS TASK_SEQ");
+		template.execute("DROP TABLE IF EXISTS TASK_EXECUTION_PARAMS");
+		template.execute("DROP TABLE IF EXISTS TASK_EXECUTION");
+		template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ");
+		template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT");
+		template.execute("DROP TABLE IF EXISTS BATCH_STEP_EXECUTION");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_SEQ");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION");
+		template.execute("DROP TABLE IF EXISTS BATCH_JOB_INSTANCE");
+	}
+
+	@Test
+	public void testWithLocalDeployer() throws Exception {
+		SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class);
+		app.setAdditionalProfiles("master");
+		app.run("--server.port=0", "--spring.datasource.url=" + DATASOURCE_URL,
+						"--spring.datasource.username=" + DATASOURCE_USER_NAME,
+						"--spring.datasource.driverClassName=" + DATASOURCE_DRIVER_CLASS_NAME);
+
+		Page<TaskExecution> taskExecutions = taskExplorer.findAll(new PageRequest(0, 10));
+		assertEquals("Five rows are expected", 5, taskExecutions.getTotalElements());
+		assertEquals("Only One master is expected", 1, taskExplorer.getTaskExecutionCountByTaskName("Partitioned Batch Job Task:master:0"));
+		assertEquals("4 partitions is expected", 4, taskExplorer.getTaskExecutionCountByTaskName("Partitioned Batch Job Task:worker:0"));
+		for (TaskExecution taskExecution : taskExecutions) {
+			assertEquals("return code should be 0", 0, taskExecution.getExitCode().intValue());
+		}
+	}
+
+	@Configuration
+	public static class TaskLauncherConfiguration {
+
+		@Bean(destroyMethod = "stop")
+		public org.h2.tools.Server initH2TCPServer() {
+			Server server;
+			try {
+				server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort",
+						String.valueOf(randomPort)).start();
+			}
+			catch (SQLException e) {
+				throw new IllegalStateException(e);
+			}
+			return server;
+		}
+
+		@Bean
+		public DataSource dataSource() {
+			DriverManagerDataSource dataSource = new DriverManagerDataSource();
+			dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME);
+			dataSource.setUrl(DATASOURCE_URL);
+			dataSource.setUsername(DATASOURCE_USER_NAME);
+			dataSource.setPassword(DATASOURCE_USER_PASSWORD);
+			return dataSource;
+		}
+	}
+
+}

spring-cloud-task-samples/task-events/README.adoc

@@ -17,7 +17,7 @@ $ ./mvnw clean install
 
 [source,shell,indent=2]
 ----
-$ java -jar target/task-events-1.0.3.BUILD-SNAPSHOT.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
+$ java -jar target/task-events-1.1.0.BUILD-SNAPSHOT.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
 ----
 
 You can listen for the events on the task-events channel with a Spring Cloud Stream Sink

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>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>

spring-cloud-task-samples/taskprocessor/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>

spring-cloud-task-samples/tasksink/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>

spring-cloud-task-samples/timestamp/README.adoc

@@ -22,5 +22,5 @@ $ mvn clean package
 
 [source,shell,indent=2]
 ----
-$ java -jar target/timestamp-task-1.0.3.BUILD-SNAPSHOT.jar
+$ java -jar target/timestamp-task-1.1.0.BUILD-SNAPSHOT.jar
 ----

spring-cloud-task-samples/timestamp/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<properties>