From 402eb87847664fcfae857b9707f2639d4d8f12f7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:19 +0100 Subject: [PATCH] Upgrade to Tomcat 9.0.31 Closes gh-20277 --- .../web/embedded/TomcatWebServerFactoryCustomizerTests.java | 3 +++ spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- .../boot/web/embedded/tomcat/SslConnectorCustomizerTests.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java index 9e7c12ffcb..d5e4c86ad0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java @@ -26,6 +26,7 @@ import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.ErrorReportValve; import org.apache.catalina.valves.RemoteIpValve; import org.apache.coyote.AbstractProtocol; +import org.apache.coyote.ajp.AbstractAjpProtocol; import org.apache.coyote.http11.AbstractHttp11Protocol; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -464,6 +465,8 @@ class TomcatWebServerFactoryCustomizerTests { void ajpConnectorCanBeCustomized() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0); factory.setProtocol("AJP/1.3"); + factory.addConnectorCustomizers( + (connector) -> ((AbstractAjpProtocol) connector.getProtocolHandler()).setSecretRequired(false)); this.customizer.customize(factory); WebServer server = factory.getWebServer(); server.start(); diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 8fea4db34d..1cac72a919 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -207,7 +207,7 @@ 2.4.1 2.0.1 3.0.4.RELEASE - 9.0.30 + 9.0.31 4.0.14 2.0.29.Final 3325375 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java index 0700ce8844..90eef99ab4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -152,7 +152,9 @@ class SslConnectorCustomizerTests { customizer.customize(connector); this.tomcat.start(); SSLHostConfig sslHostConfig = connector.getProtocolHandler().findSslHostConfigs()[0]; + sslHostConfig.getCertificates(true); SSLHostConfig sslHostConfigWithDefaults = new SSLHostConfig(); + sslHostConfigWithDefaults.getCertificates(true); assertThat(sslHostConfig.getTruststoreFile()) .isEqualTo(SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL); assertThat(sslHostConfig.getCertificateKeystoreFile())