From 4b5e73d760582b94334c47f0fedbd73bfe6066c8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 7 Sep 2018 11:00:50 +0200
Subject: [PATCH] Upgrade Maven plugins to enable builds on Java 11.

Closes gh-302.
---
 pom.xml                                       | 26 +++++++++----------
 spring-vault-core/pom.xml                     |  2 +-
 ...VaultWrappingTemplateIntegrationTests.java |  5 ++++
 spring-vault-dependencies/pom.xml             |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index bfbb26ef..f8de1558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
 			<dependency>
 				<groupId>org.assertj</groupId>
 				<artifactId>assertj-core</artifactId>
-				<version>3.9.0</version>
+				<version>3.11.0</version>
 				<scope>test</scope>
 			</dependency>
 
@@ -174,7 +174,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>2.13.0</version>
+				<version>2.21.0</version>
 				<scope>test</scope>
 			</dependency>
 
@@ -254,13 +254,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.8.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>3.1.0</version>
 					<configuration>
 						<archive>
 							<manifestEntries>
@@ -275,7 +275,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.19.1</version>
+					<version>2.22.0</version>
 				</plugin>
 
 				<plugin>
@@ -287,7 +287,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.4</version>
+					<version>3.0.1</version>
 					<configuration>
 						<breakiterator>true</breakiterator>
 						<header>${project.name}</header>
@@ -300,7 +300,7 @@
 						</stylesheetfile>
 						<!-- copies doc-files subdirectory which contains image resources -->
 						<docfilessubdirs>true</docfilessubdirs>
-						<additionalparam>-Xdoclint:none</additionalparam>
+						<doclint>none</doclint>
 						<links>
 							<link>https://docs.spring.io/spring-data/commons/docs/current/api</link>
 							<link>https://docs.spring.io/spring-data/keyvalue/docs/current/api</link>
@@ -326,18 +326,18 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.10</version>
+					<version>3.1.1</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.7.1</version>
 					<dependencies>
 						<dependency><!-- add support for ssh/scp -->
 							<groupId>org.apache.maven.wagon</groupId>
 							<artifactId>wagon-ssh</artifactId>
-							<version>1.0</version>
+							<version>3.1.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -351,7 +351,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>animal-sniffer-maven-plugin</artifactId>
-					<version>1.16</version>
+					<version>1.17</version>
 				</plugin>
 
 				<plugin>
@@ -369,13 +369,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.1.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>wagon-maven-plugin</artifactId>
-					<version>1.0</version>
+					<version>2.0.0</version>
 				</plugin>
 
 			</plugins>
diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml
index 2204d63f..03974f99 100644
--- a/spring-vault-core/pom.xml
+++ b/spring-vault-core/pom.xml
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.10</version>
+			<version>1.18.2</version>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java
index ebc91651..39482b28 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java
@@ -20,6 +20,7 @@ import java.time.Instant;
 import java.util.Collections;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.junit.Before;
@@ -162,5 +163,9 @@ public class VaultWrappingTemplateIntegrationTests extends IntegrationTestSuppor
 	@EqualsAndHashCode
 	static class Secret {
 		final String key;
+
+		Secret(@JsonProperty("key") String key) {
+			this.key = key;
+		}
 	}
 }
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index 407b3a90..0aab88b7 100644
--- a/spring-vault-dependencies/pom.xml
+++ b/spring-vault-dependencies/pom.xml
@@ -150,7 +150,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<goals>