From 02053e2b50b0e949b8000759f145978b7bf39ba9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 14 Oct 2015 20:46:49 +0100
Subject: [PATCH] Upgrade to HikariCP 2.4.1

The Java 6 module has been dropped in 2.4. Dependency management for
HikariCP-java6 is retained at the latest available version; 2.3.9.

Closes gh-4171
---
 spring-boot-dependencies/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index bc7baa8910..b139fd6dda 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -78,7 +78,8 @@
 		<hazelcast.version>3.5.3</hazelcast.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
-		<hikaricp.version>2.3.9</hikaricp.version>
+		<hikaricp.version>2.4.1</hikaricp.version>
+		<hikaricp-java6.version>2.3.9</hikaricp-java6.version>
 		<hornetq.version>2.4.7.Final</hornetq.version>
 		<hsqldb.version>2.3.3</hsqldb.version>
 		<httpasyncclient.version>4.1</httpasyncclient.version>
@@ -664,7 +665,7 @@
 			<dependency>
 				<groupId>com.zaxxer</groupId>
 				<artifactId>HikariCP-java6</artifactId>
-				<version>${hikaricp.version}</version>
+				<version>${hikaricp-java6.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-beanutils</groupId>