From 8e2e493946357bcefb53d0b0a608becad7719413 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Tue, 31 May 2016 21:58:25 +0200
Subject: [PATCH] Remove HSQLDB dependency from Batch Starter

This commit removes HSQLDB dependency from Batch Starter as most apps
that use Spring Batch will prefer to use a RDBMS of their choice to store
batch metadata.

Additionally, explicit spring-jdbc dependency has been replaced with JDBC
Starter dependency.

See gh-6081
---
 spring-boot-samples/spring-boot-sample-batch/pom.xml   |  4 ++++
 spring-boot-starters/spring-boot-starter-batch/pom.xml | 10 +++-------
 .../src/main/resources/META-INF/spring.provides        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml
index 8fa00d39832..42456724bf2 100644
--- a/spring-boot-samples/spring-boot-sample-batch/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml
@@ -23,6 +23,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-batch</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml
index 4afbc654113..a2866f8f86a 100644
--- a/spring-boot-starters/spring-boot-starter-batch/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>spring-boot-starter-batch</artifactId>
 	<name>Spring Boot Batch Starter</name>
-	<description>Starter for using Spring Batch, including HSQLDB in-memory database</description>
+	<description>Starter for using Spring Batch</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -23,12 +23,8 @@
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-batch/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-batch/src/main/resources/META-INF/spring.provides
index b7938ee467a..06ab61efdb5 100644
--- a/spring-boot-starters/spring-boot-starter-batch/src/main/resources/META-INF/spring.provides
+++ b/spring-boot-starters/spring-boot-starter-batch/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-batch
\ No newline at end of file
+provides: spring-batch-core
\ No newline at end of file