From ba1d22847d11df5c610adaaacf48f8dcde56543c Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@pivotal.io>
Date: Thu, 25 Sep 2014 09:15:26 +0200
Subject: [PATCH] DATAREDIS-350 - Upgrade to Jedis 2.6.0.

Original pull request: #105.
---
 gradle.properties | 2 +-
 template.mf       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index bb0cd3fe2..f01f7a6d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 slf4jVersion=1.7.5
 junitVersion=4.11
 jredisVersion=06052013
-jedisVersion=2.5.2
+jedisVersion=2.6.0
 springVersion=4.0.7.RELEASE
 springDataBuildVersion=1.6.0.BUILD-SNAPSHOT
 log4jVersion=1.2.17
diff --git a/template.mf b/template.mf
index 8f11ba341..1decdeccd 100644
--- a/template.mf
+++ b/template.mf
@@ -22,7 +22,7 @@ Import-Template:
  org.w3c.dom.*;version="0",
  javax.xml.transform.*;resolution:="optional";version="0",
  org.jredis.*;resolution:="optional";version="[1.0.0, 2.0.0)",
- redis.clients.*;resolution:="optional";version="[2.5.2, 2.5.2)",
+ redis.clients.*;resolution:="optional";version="[2.6.0, 2.6.0)",
  org.apache.commons.pool2.*;resolution:="optional";version="[1.0, 2.2)",
  org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)",
  com.fasterxml.jackson.*;resolution:="optional";version="[2.0.0, 3.0.0)",