diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 1f6a2bc4f2f..a8d793d1710 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -112,7 +112,7 @@
2.9.3
2.25.1
2.0.4
- 9.4.14.v20181114
+ 9.4.15.v20190215
2.2.0.v201112011158
8.0.33
1.1-rev-1
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 712dcf09ce5..d3c0ed79561 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -26,6 +26,7 @@ import java.io.PrintWriter;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.ServerSocket;
+import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -72,6 +73,8 @@ import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.ssl.PrivateKeyDetails;
+import org.apache.http.ssl.PrivateKeyStrategy;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
import org.apache.jasper.EmbeddedServletOptions;
@@ -459,7 +462,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
this.container = factory.getEmbeddedServletContainer(registration);
this.container.start();
TrustStrategy trustStrategy = new SerialNumberValidatingTrustSelfSignedStrategy(
- "77e7c302");
+ "5c7ae101");
SSLContext sslContext = new SSLContextBuilder()
.loadTrustMaterial(null, trustStrategy).build();
HttpClient httpClient = HttpClients.custom()
@@ -535,7 +538,18 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
new SSLContextBuilder()
.loadTrustMaterial(null, new TrustSelfSignedStrategy())
- .loadKeyMaterial(keyStore, "secret".toCharArray()).build());
+ .loadKeyMaterial(keyStore, "secret".toCharArray(),
+ new PrivateKeyStrategy() {
+
+ @Override
+ public String chooseAlias(
+ Map aliases,
+ Socket socket) {
+ return "spring-boot";
+ }
+
+ })
+ .build());
HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
.build();
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(
@@ -559,7 +573,17 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
new SSLContextBuilder()
.loadTrustMaterial(null, new TrustSelfSignedStrategy())
- .loadKeyMaterial(keyStore, "password".toCharArray()).build());
+ .loadKeyMaterial(keyStore, "password".toCharArray(),
+ new PrivateKeyStrategy() {
+
+ @Override
+ public String chooseAlias(
+ Map aliases,
+ Socket socket) {
+ return "spring-boot";
+ }
+ })
+ .build());
HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
.build();
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(
@@ -648,7 +672,17 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
new SSLContextBuilder()
.loadTrustMaterial(null, new TrustSelfSignedStrategy())
- .loadKeyMaterial(keyStore, "password".toCharArray()).build());
+ .loadKeyMaterial(keyStore, "password".toCharArray(),
+ new PrivateKeyStrategy() {
+
+ @Override
+ public String chooseAlias(
+ Map aliases,
+ Socket socket) {
+ return "spring-boot";
+ }
+ })
+ .build());
HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
.build();
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(
diff --git a/spring-boot/src/test/resources/test.jks b/spring-boot/src/test/resources/test.jks
index 1bce90bba66..f8a5f70596b 100644
Binary files a/spring-boot/src/test/resources/test.jks and b/spring-boot/src/test/resources/test.jks differ
diff --git a/spring-boot/src/test/resources/test.p12 b/spring-boot/src/test/resources/test.p12
index de3664b9d7d..1d6a25829c3 100644
Binary files a/spring-boot/src/test/resources/test.p12 and b/spring-boot/src/test/resources/test.p12 differ