root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Jaybird 3.0.0 

Closes gh-9200
This commit is contained in:
Andy Wilkinson 2017-05-12 10:55:15 +01:00
parent 8ee6c201e1
commit d7d55f4ad9
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-dependencies/pom.xml
View File

@ -102,7 +102,7 @@
<javax-transaction.version>1.2</javax-transaction.version> <javax-transaction.version>1.2</javax-transaction.version>
<javax-validation.version>1.1.0.Final</javax-validation.version> <javax-validation.version>1.1.0.Final</javax-validation.version>
<jaxen.version>1.1.6</jaxen.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-logging.version>3.3.1.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version> <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version> <jdom2.version>2.0.6</jdom2.version>
@ -1607,11 +1607,6 @@
<artifactId>elasticsearch</artifactId> <artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird-jdk16</artifactId>
<version>${jaybird.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.firebirdsql.jdbc</groupId> <groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird-jdk17</artifactId> <artifactId>jaybird-jdk17</artifactId>

3
spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View File

@ -123,8 +123,7 @@ public enum DatabaseDriver {
* Firebird. * Firebird.
*/ */
FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver", FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver",
"org.firebirdsql.pool.FBConnectionPoolDataSource", "org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") {
"SELECT 1 FROM RDB$DATABASE") {
@Override @Override
protected Collection<String> getUrlPrefixes() { protected Collection<String> getUrlPrefixes() {