From 27d1e695ec06e09c65abf7471007fc1d64004de2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 28 Jul 2016 18:46:03 +0200
Subject: [PATCH] Upgrade to Spring Boot 1.4 GA

Fixes gh-26
---
 pom.xml                                              |  7 ++-----
 spring-cloud-vault-config-aws/pom.xml                | 12 ------------
 .../cloud/vault/ClientHttpRequestFactoryFactory.java |  2 +-
 spring-cloud-vault-dependencies/pom.xml              |  3 ++-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4367e744..a739e9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.1.2.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -41,10 +41,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<httpclient.version>4.5.2</httpclient.version>
-		<httpcore.version>4.4.4</httpcore.version>
-		<netty.version>4.1.0.Final</netty.version>
-		<okhttp.version>2.7.5</okhttp.version>
+		<spring-boot.version>1.4.0.RELEASE</spring-boot.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml
index af250213..6d335a71 100644
--- a/spring-cloud-vault-config-aws/pom.xml
+++ b/spring-cloud-vault-config-aws/pom.xml
@@ -17,18 +17,6 @@
 	<name>Spring Cloud Vault Config AWS support</name>
 	<description>Spring Cloud Vault Config AWS support</description>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws</artifactId>
-				<version>1.1.0.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java b/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java
index b54af72e..2ecd347c 100644
--- a/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java
+++ b/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java
@@ -220,7 +220,7 @@ class ClientHttpRequestFactoryFactory {
 					okHttpClient) {
 
 				@Override
-				public void destroy() throws Exception {
+				public void destroy() throws IOException {
 
 					if (okHttpClient.getCache() != null) {
 						okHttpClient.getCache().close();
diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml
index d1c158bd..f7716dbf 100644
--- a/spring-cloud-vault-dependencies/pom.xml
+++ b/spring-cloud-vault-dependencies/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.1.2.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -21,6 +21,7 @@
 
 	<properties>
 		<spring-cloud-context.version>1.1.2.BUILD-SNAPSHOT</spring-cloud-context.version>
+		<spring-boot.version>1.4.0.RELEASE</spring-boot.version>
 		<httpclient.version>4.5.2</httpclient.version>
 		<httpcore.version>4.4.4</httpcore.version>
 		<netty.version>4.1.0.Final</netty.version>