diff --git a/src/main/java/org/springframework/data/redis/connection/convert/Converters.java b/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
index 0f8463b35..ab679f81a 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
@@ -178,7 +178,7 @@ abstract public class Converters {
 	 */
 	public static Set<RedisClusterNode> toSetOfRedisClusterNodes(String clusterNodes) {
 
-		if (StringUtils.isEmpty(clusterNodes)) {
+		if (!StringUtils.hasText(clusterNodes)) {
 			return Collections.emptySet();
 		}
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisVersionUtil.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisVersionUtil.java
index c11571844..2b65b5bbe 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisVersionUtil.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisVersionUtil.java
@@ -15,16 +15,15 @@
  */
 package org.springframework.data.redis.connection.jedis;
 
+import redis.clients.jedis.Jedis;
+
 import java.io.IOException;
 import java.util.Properties;
 
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.data.redis.Version;
-import org.springframework.data.redis.VersionParser;
+import org.springframework.data.util.Version;
 import org.springframework.util.StringUtils;
 
-import redis.clients.jedis.Jedis;
-
 /**
  * @author Christoph Strobl
  * @since 1.3
@@ -47,7 +46,7 @@ public class JedisVersionUtil {
 	 * @return
 	 */
 	static Version parseVersion(String version) {
-		return VersionParser.parseVersion(version);
+		return Version.parse(version);
 	}
 
 	/**