From d7d55f4ad93cdad074260f5c0eaefbb22df1fcae Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 12 May 2017 10:55:15 +0100
Subject: [PATCH] Upgrade to Jaybird 3.0.0

Closes gh-9200
---
 spring-boot-dependencies/pom.xml                           | 7 +------
 .../java/org/springframework/boot/jdbc/DatabaseDriver.java | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f96b0edffa..c2e29a6c62 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -102,7 +102,7 @@
 		<javax-transaction.version>1.2</javax-transaction.version>
 		<javax-validation.version>1.1.0.Final</javax-validation.version>
 		<jaxen.version>1.1.6</jaxen.version>
-		<jaybird.version>2.2.13</jaybird.version>
+		<jaybird.version>3.0.0</jaybird.version>
 		<jboss-logging.version>3.3.1.Final</jboss-logging.version>
 		<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
 		<jdom2.version>2.0.6</jdom2.version>
@@ -1607,11 +1607,6 @@
 				<artifactId>elasticsearch</artifactId>
 				<version>${elasticsearch.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.firebirdsql.jdbc</groupId>
-				<artifactId>jaybird-jdk16</artifactId>
-				<version>${jaybird.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.firebirdsql.jdbc</groupId>
 				<artifactId>jaybird-jdk17</artifactId>
diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
index b1d4fd17d2..daaee412fa 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
@@ -123,8 +123,7 @@ public enum DatabaseDriver {
 	 * Firebird.
 	 */
 	FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver",
-			"org.firebirdsql.pool.FBConnectionPoolDataSource",
-			"SELECT 1 FROM RDB$DATABASE") {
+			"org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") {
 
 		@Override
 		protected Collection<String> getUrlPrefixes() {