From 86ff5315b47c0c847280917077a5713c24a2a7b4 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Wed, 21 May 2014 11:02:03 +0100
Subject: [PATCH] Update to Jedis 2.4.1 means commons-pool2

Fixes gh-918
---
 .../boot/autoconfigure/redis/RedisAutoConfiguration.java    | 2 +-
 spring-boot-dependencies/pom.xml                            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java
index 6f6a3ed788..3ff7b49761 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.redis;
 
 import java.net.UnknownHostException;
 
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index b72c6b653e..275e98438e 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -52,6 +52,7 @@
 		<codahale-metrics.version>3.0.2</codahale-metrics.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 		<commons-pool.version>1.6</commons-pool.version>
+		<commons-pool2.version>2.2</commons-pool2.version>
 		<crashub.version>1.3.0-beta20</crashub.version>
 		<flyway.version>3.0</flyway.version>
 		<freemarker.version>2.3.20</freemarker.version>
@@ -392,6 +393,11 @@
 				<artifactId>activemq-pool</artifactId>
 				<version>${activemq.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-pool2</artifactId>
+				<version>${commons-pool2.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>