Use HikariCP is jdbc and jpa starters

This commit is a companion of what was done in #6013. As HikariCP is
now the default connection pool, the jdbc and jpa starters no longer
provide `tomcat-jdbc`, but rather `HikariCP`.

Closes gh-9392
This commit is contained in:
Stephane Nicoll 2017-06-02 16:35:44 +02:00
parent 84f0484aef
commit d48c414a64
5 changed files with 10 additions and 10 deletions

View File

@ -112,6 +112,11 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
@ -183,10 +188,5 @@
<artifactId>thymeleaf-layout-dialect</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

View File

@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify;
* @author Andy Wilkinson
*/
@RunWith(ModifiedClassPathRunner.class)
@ClassPathExclusions("tomcat-jdbc-*.jar")
@ClassPathExclusions("HikariCP-*.jar")
public class DevToolsEmbeddedDataSourceAutoConfigurationTests
extends AbstractDevToolsDataSourceAutoConfigurationTests {

View File

@ -2829,7 +2829,7 @@ Here's the algorithm for choosing a specific implementation:
DBCP2 is available we will use it.
If you use the `spring-boot-starter-jdbc` or `spring-boot-starter-data-jpa`
'`starters`' you will automatically get a dependency to `tomcat-jdbc`.
'`starters`' you will automatically get a dependency to `HikariCP`.
NOTE: You can bypass that algorithm completely and specify the connection pool to use via
the `spring.datasource.type` property. This is especially important if you are running

View File

@ -23,8 +23,8 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

View File

@ -1 +1 @@
provides: spring-jdbc,spring-tx,tomcat-jdbc
provides: spring-jdbc,spring-tx,HikariCP