From 8ecec7e511a884953979dd6e09d613ab06c31419 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Thu, 12 Sep 2013 11:53:57 -0700
Subject: [PATCH] Include Tomcat JDBC preferentially if using starter-poms

When user deploys app as a WAR in Tomcat, unless the tomcat-jdbc.jar
is in the app package, it will be found in the parent first and then
be unable to load the Driver class.

[Fixes #56720610] [bs-316] Tomcat non-embedded cannot load SQL driver class
---
 spring-boot-starters/pom.xml                  |  1 +
 .../spring-boot-starter-data-jpa/pom.xml      |  9 ++++---
 .../spring-boot-starter-jdbc/.gitignore       |  1 +
 .../spring-boot-starter-jdbc/pom.xml          | 25 +++++++++++++++++++
 .../spring-boot-starter-parent/pom.xml        |  5 ++++
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 spring-boot-starters/spring-boot-starter-jdbc/.gitignore
 create mode 100644 spring-boot-starters/spring-boot-starter-jdbc/pom.xml

diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index b3d5a50e833..8bb8da79abe 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -19,6 +19,7 @@
 		<module>spring-boot-starter-batch</module>
 		<module>spring-boot-starter-data-jpa</module>
 		<module>spring-boot-starter-integration</module>
+		<module>spring-boot-starter-jdbc</module>
 		<module>spring-boot-starter-jetty</module>
 		<module>spring-boot-starter-logging</module>
 		<module>spring-boot-starter-actuator</module>
diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
index 91dd194f019..ce78c46d3f4 100644
--- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
@@ -18,6 +18,11 @@
 			<artifactId>spring-boot-starter-aop</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
@@ -26,10 +31,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-jdbc/.gitignore b/spring-boot-starters/spring-boot-starter-jdbc/.gitignore
new file mode 100644
index 00000000000..ea8c4bf7f35
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-jdbc/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml
new file mode 100644
index 00000000000..422ee24e25e
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starters</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-jdbc</artifactId>
+	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jdbc</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index a4bb0c7ce54..45be0733526 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -52,6 +52,11 @@
 				<artifactId>spring-boot-starter-actuator</artifactId>
 				<version>0.5.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-jdbc</artifactId>
+				<version>0.5.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-web</artifactId>