Merge pull request #6081 from vpavic:improve-batch-starter

* pr/6081:
  Polish contribution
  Remove HSQLDB dependency from Batch Starter

spring-boot-samples/spring-boot-sample-batch/pom.xml

@@ -23,6 +23,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-batch</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

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>

spring-boot-starters/spring-boot-starter-batch/src/main/resources/META-INF/spring.provides

@@ -1 +1 @@
-provides: spring-batch
+provides: spring-batch-core