Skip to content

Commit ac41bcb

Browse files
committed
Upgrade to Tomcat 9.0.31
Closes gh-20253
1 parent 2b033c5 commit ac41bcb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
191191
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
192192
<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
193-
<tomcat.version>9.0.30</tomcat.version>
193+
<tomcat.version>9.0.31</tomcat.version>
194194
<unboundid-ldapsdk.version>4.0.14</unboundid-ldapsdk.version>
195195
<undertow.version>2.0.29.Final</undertow.version>
196196
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -153,7 +153,9 @@ public void customizeWhenSslStoreProviderProvidesOnlyTrustStoreShouldUseDefaultK
153153
customizer.customize(connector);
154154
this.tomcat.start();
155155
SSLHostConfig sslHostConfig = connector.getProtocolHandler().findSslHostConfigs()[0];
156+
sslHostConfig.getCertificates(true);
156157
SSLHostConfig sslHostConfigWithDefaults = new SSLHostConfig();
158+
sslHostConfigWithDefaults.getCertificates(true);
157159
assertThat(sslHostConfig.getTruststoreFile())
158160
.isEqualTo(SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL);
159161
assertThat(sslHostConfig.getCertificateKeystoreFile())

0 commit comments

Comments
 (0)