diff --git a/pom.xml b/pom.xml index 4e7a96f2..aacf6ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.6.0 1.10.3-jdk8 3.8.0 - 5.3.20 + 6.0.0-SNAPSHOT 2022.0.0-SNAPSHOT 5.4.5 2020.0.13 @@ -533,6 +533,12 @@ 2.2.1 + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.2.3 + + org.apache.maven.plugins maven-antrun-plugin 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 13db6f27..169d4cdd 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 @@ -21,6 +21,8 @@ import java.security.KeyStore; import io.netty.channel.ChannelOption; import io.netty.handler.ssl.SslContextBuilder; +import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; +import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; import reactor.netty.http.Http11SslContextSpec; import reactor.netty.http.client.HttpClient; @@ -171,7 +173,7 @@ public class ClientHttpConnectorFactory { if (hasSslConfiguration(sslConfiguration)) { - SslContextFactory sslContextFactory = new SslContextFactory(); + SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); if (sslConfiguration.getKeyStoreConfiguration().isPresent()) { KeyStore keyStore = ClientHttpRequestFactoryFactory @@ -205,7 +207,10 @@ public class ClientHttpConnectorFactory { .setIncludeCipherSuites(sslConfiguration.getEnabledCipherSuites().toArray(new String[0])); } - return new org.eclipse.jetty.client.HttpClient(sslContextFactory); + ClientConnector connector = new ClientConnector(); + connector.setSslContextFactory(sslContextFactory); + + return new org.eclipse.jetty.client.HttpClient(new HttpClientTransportOverHTTP(connector)); } return new org.eclipse.jetty.client.HttpClient(); diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index 40b286d9..c420ff74 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -59,8 +59,8 @@ 4.5.13 4.4.14 - 1.1.6 - 4.1.70.Final + 3.0.4 + 4.1.72.Final 3.14.9 2.13.3 1.11.975 diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml index d35b6871..27f2bd2d 100644 --- a/spring-vault-distribution/pom.xml +++ b/spring-vault-distribution/pom.xml @@ -405,7 +405,7 @@ org.jfrog.buildinfo artifactory-maven-plugin - 2.7.0 + 3.2.3 deploy-docs