SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Boot 1.4 GA

Browse Source 
Fixes gh-26
This commit is contained in:
Mark Paluch
2016-07-28 18:46:03 +02:00
parent 33553bf051
commit 27d1e695ec
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -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>

12
spring-cloud-vault-config-aws/pom.xml
View File

@@ -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>

2
spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java
View File

@@ -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();

3
spring-cloud-vault-dependencies/pom.xml
View File

@@ -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>