From bea353962cc852c20ec35b51291a4d6fc153ca79 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 May 2018 13:45:01 +0100 Subject: [PATCH 1/2] Align Undertow tests with changes made to fix UNDERTOW-1260 Closes gh-13055 --- ...dertowEmbeddedServletContainerFactoryTests.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java index aabe833715..b37c7d82a2 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.KeyManager; -import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLException; import io.undertow.Undertow.Builder; import io.undertow.servlet.api.DeploymentInfo; @@ -227,16 +227,16 @@ public class UndertowEmbeddedServletContainerFactoryTests @Test public void sslRestrictedProtocolsEmptyCipherFailure() throws Exception { - this.thrown.expect(anyOf(instanceOf(SSLHandshakeException.class), - instanceOf(SocketException.class))); + this.thrown.expect( + anyOf(instanceOf(SSLException.class), instanceOf(SocketException.class))); testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.2" }, new String[] { "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" }); } @Test public void sslRestrictedProtocolsECDHETLS1Failure() throws Exception { - this.thrown.expect(anyOf(instanceOf(SSLHandshakeException.class), - instanceOf(SocketException.class))); + this.thrown.expect( + anyOf(instanceOf(SSLException.class), instanceOf(SocketException.class))); testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1" }, new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" }); } @@ -255,8 +255,8 @@ public class UndertowEmbeddedServletContainerFactoryTests @Test public void sslRestrictedProtocolsRSATLS11Failure() throws Exception { - this.thrown.expect(anyOf(instanceOf(SSLHandshakeException.class), - instanceOf(SocketException.class))); + this.thrown.expect( + anyOf(instanceOf(SSLException.class), instanceOf(SocketException.class))); testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.1" }, new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" }); } From ed9ac53acd45a00fe2bd3bcd8fb8be0582ebe0d9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 May 2018 14:01:17 +0100 Subject: [PATCH 2/2] Revert "Upgrade to Ehcache 2.10.5" This reverts commit f78fd74bb9e943367e31dd2112c81da6028cf9db. See gh-13056 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 943dec1d22..71a7e3b5da 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -69,7 +69,7 @@ 10.13.1.1 1.6.1 3.1.5 - 2.10.5 + 2.10.4 3.2.3 1.50.5 3.2.1