From 9e87a782ceacb05eed6d7e1d943865d9fa2a7bad Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 26 Aug 2016 15:36:52 -0600
Subject: [PATCH] Upgrade to consul-api version 1.1.11

fixes gh-211
---
 .../cloud/consul/config/ConsulPropertySource.java         | 8 ++++++--
 spring-cloud-consul-dependencies/pom.xml                  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
index 1dd30283..445dc359 100644
--- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
+++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
@@ -91,7 +91,7 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
 			String key = getValue.getKey();
 			if (!StringUtils.endsWithIgnoreCase(key, "/")) {
 				key = key.replace(context, "").replace('/', '.');
-				String value = getDecoded(getValue.getValue());
+				String value = getValue.getDecodedValue();
 				properties.put(key, value);
 			}
 		}
@@ -118,7 +118,7 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
 	}
 
 	protected void parseValue(GetValue getValue, ConsulConfigProperties.Format format) {
-		String value = getDecoded(getValue.getValue());
+		String value = getValue.getDecodedValue();
 		Properties props = generateProperties(value, format);
 
 		for (Map.Entry entry : props.entrySet()) {
@@ -154,6 +154,10 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
 		return props;
 	}
 
+	/**
+	 * @deprecated As of 1.1.0 use {@link GetValue#getDecodedValue()}.
+	 */
+	@Deprecated
 	public String getDecoded(String value) {
 		if (value == null)
 			return null;
diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml
index 5587998b..19a87555 100644
--- a/spring-cloud-consul-dependencies/pom.xml
+++ b/spring-cloud-consul-dependencies/pom.xml
@@ -19,7 +19,7 @@
 		<spring-cloud-netflix.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-deployer.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-deployer.version>
 		<spring-cloud-stream.version>Brooklyn.BUILD-SNAPSHOT</spring-cloud-stream.version>
-		<consul-api.version>1.1.10</consul-api.version>
+		<consul-api.version>1.1.11</consul-api.version>
 		<gson.version>2.3.1</gson.version>
 		<httpclient.version>4.5</httpclient.version>
 		<httpcore.version>4.4.1</httpcore.version>