From 85f66286aba04eedcfd55a98c8eb0369828fde39 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 22 Sep 2017 17:09:07 +0200
Subject: [PATCH] Upgrade dependencies.

* Spring Framework 5.0 RC3 -> 5.0 snapshot
* Reactor Bismuth M3 -> Bismuth M4
* Spring Data Kay RC2 -> Kay RC3
* Netty 4.1.13.Final -> 4.1.15.Final
* OkHttp 3.8.1 -> 3.9.0
* Jackson 2.9.0.pr4 -> 2.9.1
* Apache httpcore 4.4.6 -> 4.4.7
* AWS SDK 1.11.161 -> 1.11.201

Closes gh-144.
---
 pom.xml                           | 31 +++++++++++++------------------
 spring-vault-dependencies/pom.xml | 10 +++++-----
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index b4bf40bf..a9be5e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,15 +22,15 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>5.0.0.RC3</spring.version>
-		<spring-data-releasetrain.version>Kay-RC2</spring-data-releasetrain.version>
-		<reactor.version>Bismuth-M3</reactor.version>
+		<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
+		<spring-data-releasetrain.version>Kay-RC3</spring-data-releasetrain.version>
+		<reactor.version>Bismuth-M4</reactor.version>
 		<java.version>1.8</java.version>
 		<project.type>multi</project.type>
 		<dist.id>spring-vault</dist.id>
 		<project.root>${basedir}</project.root>
 		<shared.resources>${project.build.directory}/shared-resources</shared.resources>
-		
+
 		<!-- To be overridden by individual modules -->
 		<java-module-name></java-module-name>
 	</properties>
@@ -210,20 +210,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<Implementation-Title>${project.name}</Implementation-Title>
-							<Implementation-Version>${project.version}</Implementation-Version>
-							<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -266,6 +252,15 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>3.0.2</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Implementation-Title>${project.name}</Implementation-Title>
+								<Implementation-Version>${project.version}</Implementation-Version>
+								<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
+							</manifestEntries>
+						</archive>
+					</configuration>
 				</plugin>
 
 				<plugin>
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index b2b98e76..31165616 100644
--- a/spring-vault-dependencies/pom.xml
+++ b/spring-vault-dependencies/pom.xml
@@ -58,10 +58,10 @@
 
 	<properties>
 		<httpclient.version>4.5.3</httpclient.version>
-		<httpcore.version>4.4.6</httpcore.version>
-		<netty.version>4.1.13.Final</netty.version>
-		<okhttp3.version>3.8.1</okhttp3.version>
-		<jackson.version>2.9.0.pr4</jackson.version>
+		<httpcore.version>4.4.7</httpcore.version>
+		<netty.version>4.1.15.Final</netty.version>
+		<okhttp3.version>3.9.0</okhttp3.version>
+		<jackson.version>2.9.1</jackson.version>
 	</properties>
 
 	<dependencyManagement>
@@ -120,7 +120,7 @@
 			<dependency>
 				<groupId>com.amazonaws</groupId>
 				<artifactId>aws-java-sdk-core</artifactId>
-				<version>1.11.161</version>
+				<version>1.11.201</version>
 				<optional>true</optional>
 			</dependency>