From c0a8a305ec67cb5554b0b12fc72ca8549ff4330b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Thu, 10 Dec 2020 11:28:02 +0100
Subject: [PATCH] Upgrade dependencies

* HttpClient 4.5.13
* HttpCore 4.4.14
* Jetty Reactive Httpclient 1.1.4
* Jackson Databind 2.12.0
* AWS SDK 1.11.916
* Google API Services v1-rev20201112-1.31.0
* Google Oauth 0.22.1
* BouncyCastle 1.67
* AssertJ 3.18.1
* JUnit 5.7.0
* Kotlin 1.4.21
* Kotlin Coroutines 1.4.2
* Mockito 3.6.28
* Spring Framework 5.3.2
* Spring Data 2020.0.2
* Spring Security 5.4.2
* Reactor Dysprosium 2020.0.2

Closes gh-607
---
 pom.xml                                       | 22 +++++++++----------
 .../VaultTransitTemplateIntegrationTests.java |  3 ++-
 spring-vault-dependencies/pom.xml             | 16 +++++++-------
 spring-vault-distribution/pom.xml             |  2 +-
 .../reference/vault-repositories.adoc         |  2 +-
 src/main/resources/changelog.txt              |  1 +
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd696bca..d28c6a5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,17 +20,17 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<assertj-core.version>3.17.2</assertj-core.version>
+		<assertj-core.version>3.18.1</assertj-core.version>
 		<json-path.version>2.4.0</json-path.version>
 		<junit.version>5.7.0</junit.version>
-		<kotlin.version>1.3.72</kotlin.version>
-		<kotlin-coroutines.version>1.3.8</kotlin-coroutines.version>
-		<mockk.version>1.10.0</mockk.version>
-		<mockito-core.version>3.5.10</mockito-core.version>
-		<spring.version>5.2.9.RELEASE</spring.version>
-		<spring-data-releasetrain.version>Neumann-SR3</spring-data-releasetrain.version>
-		<spring-security-bom.version>5.4.0</spring-security-bom.version>
-		<reactor.version>Dysprosium-SR12</reactor.version>
+		<kotlin.version>1.4.21</kotlin.version>
+		<kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
+		<mockk.version>1.10.3-jdk8</mockk.version>
+		<mockito-core.version>3.6.28</mockito-core.version>
+		<spring.version>5.3.2</spring.version>
+		<spring-data-bom.version>2020.0.2</spring-data-bom.version>
+		<spring-security-bom.version>5.4.2</spring-security-bom.version>
+		<reactor.version>2020.0.2</reactor.version>
 		<java.version>1.8</java.version>
 		<project.type>multi</project.type>
 		<dist.id>spring-vault</dist.id>
@@ -135,8 +135,8 @@
 
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-releasetrain</artifactId>
-				<version>${spring-data-releasetrain.version}</version>
+				<artifactId>spring-data-bom</artifactId>
+				<version>${spring-data-bom.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
index 1e668ba9..d3b3338d 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java
@@ -557,7 +557,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport {
 			assertThat(decrypted.get(1).getCause()).isInstanceOf(VaultException.class);
 		}
 		catch (VaultException e) {
-			assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is different
+			assertThat(e).hasMessageContaining("error"); // Vault 1.6 behavior is
+															// different
 		}
 	}
 
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index d42354ae..d2577bc1 100644
--- a/spring-vault-dependencies/pom.xml
+++ b/spring-vault-dependencies/pom.xml
@@ -57,16 +57,16 @@
 	</licenses>
 
 	<properties>
-		<httpclient.version>4.5.12</httpclient.version>
-		<httpcore.version>4.4.13</httpcore.version>
+		<httpclient.version>4.5.13</httpclient.version>
+		<httpcore.version>4.4.14</httpcore.version>
 		<jetty-reactive-httpclient.version>1.1.4</jetty-reactive-httpclient.version>
-		<netty.version>4.1.52.Final</netty.version>
+		<netty.version>4.1.55.Final</netty.version>
 		<okhttp3.version>3.14.9</okhttp3.version>
-		<jackson-databind.version>2.11.2</jackson-databind.version>
-		<aws-java-sdk.version>1.11.861</aws-java-sdk.version>
-		<google-api-services-iam.version>v1-rev20200827-1.30.10</google-api-services-iam.version>
-		<google-auth-library-oauth2-http.version>0.21.1</google-auth-library-oauth2-http.version>
-		<bcpkix-jdk15on.version>1.66</bcpkix-jdk15on.version>
+		<jackson-databind.version>2.12.0</jackson-databind.version>
+		<aws-java-sdk.version>1.11.916</aws-java-sdk.version>
+		<google-api-services-iam.version>v1-rev20201112-1.31.0</google-api-services-iam.version>
+		<google-auth-library-oauth2-http.version>0.22.1</google-auth-library-oauth2-http.version>
+		<bcpkix-jdk15on.version>1.67</bcpkix-jdk15on.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml
index 67e03d4e..cd24f5a5 100644
--- a/spring-vault-distribution/pom.xml
+++ b/spring-vault-distribution/pom.xml
@@ -360,7 +360,7 @@
 									<projectVersion>${project.version}</projectVersion>
 									<springVersion>${spring.version}</springVersion>
 									<springDataVersion>
-										${spring-data-releasetrain.version}
+										${spring-data-bom.version}
 									</springDataVersion>
 									<allow-uri-read>true</allow-uri-read>
 									<toclevels>4</toclevels>
diff --git a/src/main/asciidoc/reference/vault-repositories.adoc b/src/main/asciidoc/reference/vault-repositories.adoc
index b768d515..4dac8757 100644
--- a/src/main/asciidoc/reference/vault-repositories.adoc
+++ b/src/main/asciidoc/reference/vault-repositories.adoc
@@ -62,7 +62,7 @@ Then add the following to `pom.xml` dependencies section.
   <dependencies>
     <dependency>
       <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-releasetrain</artifactId>
+      <artifactId>spring-data-bom</artifactId>
       <version>{springDataVersion}</version>
       <scope>import</scope>
       <type>pom</type>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 726a77cc..504e2d93 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -14,6 +14,7 @@ Changes in version 2.3.0-RC1
 * Netty4ClientHttpRequestFactory left uninitialized causing IllegalArgumentException: SSLContext is null #597
 * Logger is not passed required parameter #599
 * Infinite loop when using rotating generic secrets without TTL #601
+* Upgrade dependencies #607
 
 Changes in version 2.3.0-M1
 -----------------------------------------