From 5cc5254b3855078de8dad7a010cfe226410acfcb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 22 Sep 2023 10:39:17 +0200
Subject: [PATCH] Upgrade dependencies.

AWS Java SDK 2.20.152, HTTP Client 5.2.1, HTTP Core 5.2.3, Jackson 2.15.2, Jetty Reactive HTTP Client 4.0, Kotlin 1.8.22, Kotlin Coroutines 1.7.3, Mockito 5.5.0, Netty 4.1.98.Final, Spring Data 2023.0.0-M3, Spring Security 6.2.0-M3, Reactor 2023.0.0-M3.

Closes gh-817
---
 pom.xml                                       | 87 +++++++++----------
 .../client/ClientHttpConnectorFactory.java    |  2 +-
 2 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e965aac..3e563924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,30 +20,29 @@
 	<properties>
 		<antora.version>0.0.3</antora.version>
 		<assertj-core.version>3.24.2</assertj-core.version>
-		<aws-java-sdk.version>2.18.24</aws-java-sdk.version>
+		<aws-java-sdk.version>2.20.152</aws-java-sdk.version>
 		<bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.version>
 		<google-api-services-iam.version>v1-rev20221013-2.0.0
 		</google-api-services-iam.version>
-		<google-cloud-iamcredentials.version>2.6.0</google-cloud-iamcredentials.version>
-		<google-auth-library-oauth2-http.version>1.13.0
+		<google-cloud-iamcredentials.version>2.24.0</google-cloud-iamcredentials.version>
+		<google-auth-library-oauth2-http.version>1.19.0
 		</google-auth-library-oauth2-http.version>
-		<httpclient.version>5.1.4</httpclient.version>
-		<httpcore.version>5.1.4</httpcore.version>
-		<jackson-databind.version>2.14.3</jackson-databind.version>
-		<jetty-reactive-httpclient.version>3.0.8</jetty-reactive-httpclient.version>
+		<httpclient5.version>5.2.1</httpclient5.version>
+		<httpcore5.version>5.2.3</httpcore5.version>
+		<jackson-databind.version>2.15.2</jackson-databind.version>
+		<jetty-reactive-httpclient.version>4.0.0</jetty-reactive-httpclient.version>
 		<json-path.version>2.8.0</json-path.version>
-		<junit.version>5.9.2</junit.version>
-		<kotlin.version>1.7.21</kotlin.version>
-		<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
-		<mockk.version>1.13.5</mockk.version>
-		<mockito-core.version>4.9.0</mockito-core.version>
-		<netty.version>4.1.93.Final</netty.version>
+		<junit.version>5.10.0</junit.version>
+		<kotlin.version>1.8.22</kotlin.version>
+		<kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
+		<mockk.version>1.13.7</mockk.version>
+		<mockito-core.version>5.5.0</mockito-core.version>
+		<netty.version>4.1.98.Final</netty.version>
 		<okhttp3.version>3.14.9</okhttp3.version>
-		<spring.version>6.0.10</spring.version>
-		<spring-asciidoctor-backends.version>0.0.4</spring-asciidoctor-backends.version>
-		<spring-data-bom.version>2023.0.1</spring-data-bom.version>
-		<spring-security-bom.version>6.0.2</spring-security-bom.version>
-		<reactor.version>2022.0.8</reactor.version>
+		<spring.version>6.1.0-M5</spring.version>
+		<spring-data-bom.version>2023.1.0-M3</spring-data-bom.version>
+		<spring-security-bom.version>6.2.0-M3</spring-security-bom.version>
+		<reactor.version>2023.0.0-M3</reactor.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
@@ -94,7 +93,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-				Copyright 2016-2022 the original author or authors.
+				Copyright 2016-2023 the original author or authors.
 
 				Licensed under the Apache License, Version 2.0 (the "License");
 				you may not use this file except in compliance with the License.
@@ -181,7 +180,7 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents.client5</groupId>
 				<artifactId>httpclient5</artifactId>
-				<version>${httpclient.version}</version>
+				<version>${httpclient5.version}</version>
 				<optional>true</optional>
 				<exclusions>
 					<exclusion>
@@ -194,14 +193,14 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents.core5</groupId>
 				<artifactId>httpcore5</artifactId>
-				<version>${httpcore.version}</version>
+				<version>${httpcore5.version}</version>
 				<optional>true</optional>
 			</dependency>
 
 			<dependency>
 				<groupId>org.apache.httpcomponents.core5</groupId>
 				<artifactId>httpcore5-reactive</artifactId>
-				<version>${httpcore.version}</version>
+				<version>${httpcore5.version}</version>
 				<optional>true</optional>
 			</dependency>
 
@@ -542,7 +541,6 @@
 					<version>3.3.1</version>
 				</plugin>
 
-
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
@@ -564,31 +562,31 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.4.1</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.1.2</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.1.2</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.3.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.6.0</version>
 					<configuration>
 						<locale>en_US</locale>
 						<breakiterator>true</breakiterator>
@@ -628,7 +626,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.0.1</version>
 				</plugin>
 
 				<plugin>
@@ -640,25 +638,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.5.0</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.8.2</version>
+					<version>3.6.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.0.1</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.asciidoctor</groupId>
-					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>2.2.3</version>
+					<version>3.1.0</version>
 				</plugin>
 
 				<plugin>
@@ -676,7 +662,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.6.0</version>
 				</plugin>
 
 				<plugin>
@@ -688,7 +674,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>flatten-maven-plugin</artifactId>
-					<version>1.4.1</version>
+					<version>1.5.0</version>
 				</plugin>
 
 			</plugins>
@@ -701,7 +687,7 @@
 			<id>springNext</id>
 
 			<properties>
-				<spring.version>6.0.0-SNAPSHOT</spring.version>
+				<spring.version>6.1.0-SNAPSHOT</spring.version>
 			</properties>
 
 			<repositories>
@@ -1014,6 +1000,13 @@
 		</profile>
 	</profiles>
 
+	<repositories>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
+	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins-release</id>
@@ -1021,4 +1014,6 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+
+
 </project>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java
index 559805ce..b84f4b24 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java
@@ -33,7 +33,7 @@ import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBu
 import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
 import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
 import org.apache.hc.core5.util.Timeout;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import reactor.netty.http.Http11SslContextSpec;