Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
ac41bcbb
Commit
ac41bcbb
authored
Feb 21, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Tomcat 9.0.31
Closes gh-20253
parent
2b033c53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
SslConnectorCustomizerTests.java
...boot/web/embedded/tomcat/SslConnectorCustomizerTests.java
+3
-1
No files found.
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
ac41bcbb
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
<thymeleaf-layout-dialect.version>
2.3.0
</thymeleaf-layout-dialect.version>
<thymeleaf-layout-dialect.version>
2.3.0
</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>
2.0.1
</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-data-attribute.version>
2.0.1
</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>
3.0.4.RELEASE
</thymeleaf-extras-java8time.version>
<thymeleaf-extras-java8time.version>
3.0.4.RELEASE
</thymeleaf-extras-java8time.version>
<tomcat.version>
9.0.3
0
</tomcat.version>
<tomcat.version>
9.0.3
1
</tomcat.version>
<unboundid-ldapsdk.version>
4.0.14
</unboundid-ldapsdk.version>
<unboundid-ldapsdk.version>
4.0.14
</unboundid-ldapsdk.version>
<undertow.version>
2.0.29.Final
</undertow.version>
<undertow.version>
2.0.29.Final
</undertow.version>
<webjars-hal-browser.version>
3325375
</webjars-hal-browser.version>
<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
View file @
ac41bcbb
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -153,7 +153,9 @@ public class SslConnectorCustomizerTests {
...
@@ -153,7 +153,9 @@ public class SslConnectorCustomizerTests {
customizer
.
customize
(
connector
);
customizer
.
customize
(
connector
);
this
.
tomcat
.
start
();
this
.
tomcat
.
start
();
SSLHostConfig
sslHostConfig
=
connector
.
getProtocolHandler
().
findSslHostConfigs
()[
0
];
SSLHostConfig
sslHostConfig
=
connector
.
getProtocolHandler
().
findSslHostConfigs
()[
0
];
sslHostConfig
.
getCertificates
(
true
);
SSLHostConfig
sslHostConfigWithDefaults
=
new
SSLHostConfig
();
SSLHostConfig
sslHostConfigWithDefaults
=
new
SSLHostConfig
();
sslHostConfigWithDefaults
.
getCertificates
(
true
);
assertThat
(
sslHostConfig
.
getTruststoreFile
())
assertThat
(
sslHostConfig
.
getTruststoreFile
())
.
isEqualTo
(
SslStoreProviderUrlStreamHandlerFactory
.
TRUST_STORE_URL
);
.
isEqualTo
(
SslStoreProviderUrlStreamHandlerFactory
.
TRUST_STORE_URL
);
assertThat
(
sslHostConfig
.
getCertificateKeystoreFile
())
assertThat
(
sslHostConfig
.
getCertificateKeystoreFile
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment