From 09fa8255cdfbabb5189f8c2d819c3b213ff8d867 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Feb 2020 20:17:18 +0000 Subject: [PATCH] Upgrade to Tomcat 9.0.31 Closes gh-20167 --- .../web/embedded/TomcatWebServerFactoryCustomizerTests.java | 3 +++ spring-boot-project/spring-boot-dependencies/build.gradle | 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 0f0bac10d73..cb6d9b8c472 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; @@ -490,6 +491,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/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8f5e2de2853..35feb8edc1e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1765,7 +1765,7 @@ bom { ] } } - library("Tomcat", "9.0.30") { + library("Tomcat", "9.0.31") { group("org.apache.tomcat") { modules = [ "tomcat-annotations-api", 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 0700ce88442..90eef99ab42 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())