From 9e2e8240981133f4069c740e7a668a7c8998f6d3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 16 Dec 2016 16:59:48 +0000 Subject: [PATCH] Upgrade to Tomcat 8.5.11 Closes gh-7360 --- spring-boot-dependencies/pom.xml | 2 +- ...atEmbeddedServletContainerFactoryTests.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index f7766e282b..aefeef13b0 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -176,7 +176,7 @@ 1.4.0 1.3 2.1.0.RELEASE - 8.5.6 + 8.5.11 1.3.25.Final 1.7 2.0 diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index be19e2be50..ac3690d905 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 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. @@ -246,14 +246,18 @@ public class TomcatEmbeddedServletContainerFactoryTests TomcatEmbeddedServletContainerFactory factory = getFactory(); factory.setUriEncoding(Charset.forName("US-ASCII")); Tomcat tomcat = getTomcat(factory); - assertThat(tomcat.getConnector().getURIEncoding()).isEqualTo("US-ASCII"); + Connector connector = ((TomcatEmbeddedServletContainer) this.container) + .getServiceConnectors().get(tomcat.getService())[0]; + assertThat(connector.getURIEncoding()).isEqualTo("US-ASCII"); } @Test public void defaultUriEncoding() throws Exception { TomcatEmbeddedServletContainerFactory factory = getFactory(); Tomcat tomcat = getTomcat(factory); - assertThat(tomcat.getConnector().getURIEncoding()).isEqualTo("UTF-8"); + Connector connector = ((TomcatEmbeddedServletContainer) this.container) + .getServiceConnectors().get(tomcat.getService())[0]; + assertThat(connector.getURIEncoding()).isEqualTo("UTF-8"); } @Test @@ -262,13 +266,12 @@ public class TomcatEmbeddedServletContainerFactoryTests ssl.setKeyStore("test.jks"); ssl.setKeyStorePassword("secret"); ssl.setCiphers(new String[] { "ALPHA", "BRAVO", "CHARLIE" }); - TomcatEmbeddedServletContainerFactory factory = getFactory(); factory.setSsl(ssl); Tomcat tomcat = getTomcat(factory); - Connector connector = tomcat.getConnector(); - + Connector connector = ((TomcatEmbeddedServletContainer) this.container) + .getServiceConnectors().get(tomcat.getService())[0]; SSLHostConfig[] sslHostConfigs = connector.getProtocolHandler() .findSslHostConfigs(); assertThat(sslHostConfigs[0].getCiphers()).isEqualTo("ALPHA:BRAVO:CHARLIE"); @@ -308,9 +311,8 @@ public class TomcatEmbeddedServletContainerFactoryTests this.container = factory .getEmbeddedServletContainer(sessionServletRegistration()); Tomcat tomcat = ((TomcatEmbeddedServletContainer) this.container).getTomcat(); - Connector connector = tomcat.getConnector(); - this.container.start(); + Connector connector = tomcat.getConnector(); SSLHostConfig sslHostConfig = connector.getProtocolHandler() .findSslHostConfigs()[0]; assertThat(sslHostConfig.getSslProtocol()).isEqualTo("TLS");