From c24f02696fb736424d68eea071d5d65993e7c5c7 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Fri, 8 Feb 2019 19:45:24 +0100
Subject: [PATCH] Upgrade to Californium-BUILD-SNAPSHOT

See gh-15878
---
 spring-boot-project/spring-boot-dependencies/pom.xml           | 2 +-
 .../undertow/UndertowServletWebServerFactoryTests.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index ddab3f90b7..b57ca495d0 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -148,7 +148,7 @@
 		<quartz.version>2.3.0</quartz.version>
 		<querydsl.version>4.2.1</querydsl.version>
 		<rabbit-amqp-client.version>5.4.3</rabbit-amqp-client.version>
-		<reactor-bom.version>Californium-SR4</reactor-bom.version>
+		<reactor-bom.version>Californium-BUILD-SNAPSHOT</reactor-bom.version>
 		<rest-assured.version>3.1.1</rest-assured.version>
 		<reactive-streams.version>1.0.2</reactive-streams.version>
 		<rxjava.version>1.3.8</rxjava.version>
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
index ccb527aa5f..5d9eae4c12 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
@@ -214,7 +214,8 @@ public class UndertowServletWebServerFactoryTests
 				.isThrownBy(() -> testRestrictedSSLProtocolsAndCipherSuites(
 						new String[] { "TLSv1.2" },
 						new String[] { "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" }))
-				.isInstanceOfAny(SSLHandshakeException.class, SocketException.class);
+				.isInstanceOfAny(SSLException.class, SSLHandshakeException.class,
+						SocketException.class);
 	}
 
 	@Test