From cb3efc1ef6d9b4df7425227ae3ba56639e5cb5ba Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Mon, 5 Aug 2019 14:56:37 +0200
Subject: [PATCH] Add dependency management for IBM DB2 JDBC driver

See gh-17782
---
 spring-boot-project/spring-boot-dependencies/pom.xml        | 6 ++++++
 spring-boot-project/spring-boot/pom.xml                     | 5 +++++
 .../boot/jdbc/DatabaseDriverClassNameTests.java             | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 516a2c8869..b63fca03d9 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -54,6 +54,7 @@
 		<couchbase-client.version>2.7.9</couchbase-client.version>
 		<couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
 		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
+		<db2-jdbc.version>11.5.0.0</db2-jdbc.version>
 		<derby.version>10.14.2.0</derby.version>
 		<dropwizard-metrics.version>4.1.0</dropwizard-metrics.version>
 		<ehcache.version>2.10.6</ehcache.version>
@@ -716,6 +717,11 @@
 				<artifactId>hazelcast-spring</artifactId>
 				<version>${hazelcast.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.ibm.db2</groupId>
+				<artifactId>jcc</artifactId>
+				<version>${db2-jdbc.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.jayway.jsonpath</groupId>
 				<artifactId>json-path</artifactId>
diff --git a/spring-boot-project/spring-boot/pom.xml b/spring-boot-project/spring-boot/pom.xml
index 61876b5682..33e2bc8632 100644
--- a/spring-boot-project/spring-boot/pom.xml
+++ b/spring-boot-project/spring-boot/pom.xml
@@ -361,6 +361,11 @@
 			<artifactId>h2</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.ibm.db2</groupId>
+			<artifactId>jcc</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
index e49befd13f..d1ae0f129e 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
@@ -44,8 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 class DatabaseDriverClassNameTests {
 
-	private static final Set<DatabaseDriver> EXCLUDED_DRIVERS = Collections.unmodifiableSet(
-			EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.DB2, DatabaseDriver.DB2_AS400,
+	private static final Set<DatabaseDriver> EXCLUDED_DRIVERS = Collections
+			.unmodifiableSet(EnumSet.of(DatabaseDriver.UNKNOWN, DatabaseDriver.ORACLE, DatabaseDriver.DB2_AS400,
 					DatabaseDriver.INFORMIX, DatabaseDriver.HANA, DatabaseDriver.TERADATA, DatabaseDriver.REDSHIFT));
 
 	@ParameterizedTest(name = "{0} {2}")