Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 6 snapshots.

Browse Source 
Closes #667.
This commit is contained in:
Mark Paluch
2021-09-27 14:30:37 +02:00
parent 55f40c4c2e
commit 276c0e14fb
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -27,7 +27,7 @@
<kotlin-coroutines.version>1.6.0</kotlin-coroutines.version>
<mockk.version>1.10.3-jdk8</mockk.version>
<mockito-core.version>3.8.0</mockito-core.version>
<spring.version>5.3.20</spring.version>
<spring.version>6.0.0-SNAPSHOT</spring.version>
<spring-data-bom.version>2022.0.0-SNAPSHOT</spring-data-bom.version>
<spring-security-bom.version>5.4.5</spring-security-bom.version>
<reactor.version>2020.0.13</reactor.version>
@@ -533,6 +533,12 @@
<version>2.2.1</version>
</plugin>
<plugin>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>artifactory-maven-plugin</artifactId>
<version>3.2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>

9
spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java
View File

@@ -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();

4
spring-vault-dependencies/pom.xml
View File

@@ -59,8 +59,8 @@
<properties>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.14</httpcore.version>
<jetty-reactive-httpclient.version>1.1.6</jetty-reactive-httpclient.version>
<netty.version>4.1.70.Final</netty.version>
<jetty-reactive-httpclient.version>3.0.4</jetty-reactive-httpclient.version>
<netty.version>4.1.72.Final</netty.version>
<okhttp3.version>3.14.9</okhttp3.version>
<jackson-databind.version>2.13.3</jackson-databind.version>
<aws-java-sdk.version>1.11.975</aws-java-sdk.version>

2
spring-vault-distribution/pom.xml
View File

@@ -405,7 +405,7 @@
<plugin>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>artifactory-maven-plugin</artifactId>
<version>2.7.0</version>
<version>3.2.3</version>
<executions>
<execution>
<id>deploy-docs</id>