From b1ba484d0c34a10f04236fdeef49b1b5db7e7ef3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 18 Nov 2016 12:03:41 +0000
Subject: [PATCH] Add dependency management for SQL Server's JDBC driver

Closes gh-7413
---
 spring-boot-dependencies/pom.xml                            | 6 ++++++
 spring-boot/pom.xml                                         | 5 +++++
 .../boot/jdbc/DatabaseDriverClassNameTests.java             | 5 ++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 50d4fd69ec..13a88c0f23 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -128,6 +128,7 @@
 		<logback.version>1.1.7</logback.version>
 		<lombok.version>1.16.10</lombok.version>
 		<mariadb.version>1.4.6</mariadb.version>
+		<mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version>
 		<mockito.version>1.10.19</mockito.version>
 		<mongodb.version>3.2.2</mongodb.version>
 		<mysql.version>5.1.40</mysql.version>
@@ -742,6 +743,11 @@
 				<artifactId>json-path-assert</artifactId>
 				<version>${json-path.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.microsoft.sqlserver</groupId>
+				<artifactId>mssql-jdbc</artifactId>
+				<version>${mssql-jdbc.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.querydsl</groupId>
 				<artifactId>querydsl-apt</artifactId>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 829d8092f2..5eb19b4b47 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -256,6 +256,11 @@
 			<artifactId>h2</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp</groupId>
 			<artifactId>okhttp</artifactId>
diff --git a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
index 234658d712..e4bcfa109c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
@@ -42,9 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DatabaseDriverClassNameTests {
 
 	private static final EnumSet<DatabaseDriver> excludedDrivers = EnumSet.of(
-			DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.SQLSERVER,
-			DatabaseDriver.DB2, DatabaseDriver.DB2_AS400, DatabaseDriver.INFORMIX,
-			DatabaseDriver.TERADATA);
+			DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.DB2,
+			DatabaseDriver.DB2_AS400, DatabaseDriver.INFORMIX, DatabaseDriver.TERADATA);
 
 	private final String className;