Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11148 - Migrate HikariCP from Java 1.6 to Java 1.8

This commit is contained in:
Robin Anil 2016-09-24 17:17:16 -05:00 committed by Vlad Mihalcea
parent 88bc2db28a
commit 921d76ef99
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
View File

@ -56,7 +56,7 @@ public class HikariCPConnectionProviderTest extends BaseCoreFunctionalTestCase {
}
catch (SQLException e) {
// expected
assertTrue( e.getMessage().contains( "Timeout" ) );
assertTrue( e.getMessage().contains( "Connection is not available, request timed out after" ) );
}
for ( Connection conn : conns ) {
@ -72,7 +72,7 @@ public class HikariCPConnectionProviderTest extends BaseCoreFunctionalTestCase {
}
catch (Exception e) {
// expected
assertTrue( e.getMessage().contains( "shutdown" ) );
assertTrue( e.getMessage().contains( "has been closed" ) );
}
}
}

2
libraries.gradle
View File

@ -122,7 +122,7 @@ ext {
ehcache3: "org.ehcache:ehcache:3.0.0",
jcache: "javax.cache:cache-api:1.0.0",
proxool: "proxool:proxool:0.8.3",
hikaricp: "com.zaxxer:HikariCP-java6:2.3.9",
hikaricp: "com.zaxxer:HikariCP:2.5.1",
// Arquillian/Shrinkwrap
arquillian_junit_container: "org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}",