Merge branch '1.3.x'

spring-boot-dependencies/pom.xml

@@ -164,7 +164,7 @@
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
 		<tomcat.version>8.0.32</tomcat.version>
-		<undertow.version>1.3.18.Final</undertow.version>
+		<undertow.version>1.3.19.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>

spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java

@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import samples.websocket.undertow.client.GreetingService;
@@ -58,7 +57,6 @@ public class SampleWebSocketsApplicationTests {
 	private int port = 1234;
 
 	@Test
-	@Ignore("UNDERTOW-639")
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
 				ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)

spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java

@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import samples.websocket.undertow.SampleUndertowWebSocketsApplication;
@@ -63,7 +62,6 @@ public class CustomContainerWebSocketsApplicationTests {
 	private static int PORT = SocketUtils.findAvailableTcpPort();
 
 	@Test
-	@Ignore("UNDERTOW-639")
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
 				ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)