Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gh-2843'

Browse Source
This commit is contained in:
Andy Wilkinson
2015-06-18 14:14:32 +01:00
parent b27510f898 3c9535f26b
commit b31c995b7a
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DriverClassNameProvider.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,6 +46,9 @@ class DriverClassNameProvider {
drivers.put("postgresql", "org.postgresql.Driver");
drivers.put("jtds", "net.sourceforge.jtds.jdbc.Driver");
drivers.put("sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver");
drivers.put("firebirdsql", "org.firebirdsql.jdbc.FBDriver");
drivers.put("db2", "com.ibm.db2.jcc.DB2Driver");
drivers.put("teradata", "com.teradata.jdbc.TeraDriver");
DRIVERS = Collections.unmodifiableMap(drivers);
}

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

@@ -90,6 +90,7 @@
<javax-mail.version>1.5.3</javax-mail.version>
<javax-transaction.version>1.2</javax-transaction.version>
<jaxen.version>1.1.6</jaxen.version>
<jaybird.version>2.2.8</jaybird.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.7.2</jedis.version>
<jersey.version>2.18</jersey.version>
@@ -1318,6 +1319,21 @@
<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>
<version>${jaybird.version}</version>
</dependency>
<dependency>
<groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird-jdk18</artifactId>
<version>${jaybird.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>