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

Upgrade to Hikaricp 2.7.8 

Closes gh-12252
This commit is contained in:
Andy Wilkinson 2018-02-27 14:56:14 +00:00
parent 410555a1b6
commit 476b7087a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java
View File

@ -114,13 +114,13 @@ public class DataSourcePoolMetricsAutoConfigurationTests {
} }
@Test @Test
public void failureToInstrumentHikariDataSourceIsTolerated() { public void hikariCanBeInstrumentedAfterThePoolHasBeenSealed() {
this.contextRunner.withUserConfiguration(HikariSealingConfiguration.class) this.contextRunner.withUserConfiguration(HikariSealingConfiguration.class)
.run((context) -> { .run((context) -> {
assertThat(context).hasNotFailed(); assertThat(context).hasNotFailed();
context.getBean(DataSource.class).getConnection(); context.getBean(DataSource.class).getConnection();
MeterRegistry registry = context.getBean(MeterRegistry.class); MeterRegistry registry = context.getBean(MeterRegistry.class);
assertThat(registry.find("hikaricp.connections").meter()).isNull(); assertThat(registry.find("hikaricp.connections").meter()).isNotNull();
}); });
} }

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -61,7 +61,7 @@
<hazelcast-hibernate5.version>1.2.3</hazelcast-hibernate5.version> <hazelcast-hibernate5.version>1.2.3</hazelcast-hibernate5.version>
<hibernate.version>5.2.13.Final</hibernate.version> <hibernate.version>5.2.13.Final</hibernate.version>
<hibernate-validator.version>6.0.7.Final</hibernate-validator.version> <hibernate-validator.version>6.0.7.Final</hibernate-validator.version>
<hikaricp.version>2.7.7</hikaricp.version> <hikaricp.version>2.7.8</hikaricp.version>
<hsqldb.version>2.4.0</hsqldb.version> <hsqldb.version>2.4.0</hsqldb.version>
<htmlunit.version>2.29</htmlunit.version> <htmlunit.version>2.29</htmlunit.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version> <httpasyncclient.version>4.1.3</httpasyncclient.version>