Skip to content

Commit f28e3d5

Browse files
wilkinsonawilkinsona
committed
Upgrade to Tomcat 8.5.3
This commit changes the default version of Tomcat to 8.5.3 while also retaining support for Tomcat 8.0 and 7.0. The main difference in 8.5 is that the ServerSocketFactory abstraction that allowed the TrustStore and KeyStore to be configured programatically no longer exists. This logic has been replaced with the use of a custom URL protocol (springbootssl) that provides access to the key store and trust store of an SslStoreProvider. In addition to working with 8.5, this approach has the advantage of also working with 8.0 and 7.0. Closes spring-projectsgh-6164
1 parent 06b81cf commit f28e3d5

File tree

28 files changed

+521
-154
lines changed

28 files changed

+521
-154
lines changed

‎spring-boot-actuator/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@
308308
<scope>test</scope>
309309
</dependency>
310310
<dependency>
311-
<groupId>org.apache.tomcat.embed</groupId>
312-
<artifactId>tomcat-embed-logging-juli</artifactId>
311+
<groupId>org.apache.tomcat</groupId>
312+
<artifactId>tomcat-juli</artifactId>
313313
<scope>test</scope>
314314
</dependency>
315315
<dependency>

‎spring-boot-dependencies/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version>
174174
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
175175
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
176-
<tomcat.version>8.0.33</tomcat.version>
176+
<tomcat.version>8.5.3</tomcat.version>
177177
<undertow.version>1.3.22.Final</undertow.version>
178178
<velocity.version>1.7</velocity.version>
179179
<velocity-tools.version>2.0</velocity-tools.version>
@@ -1314,11 +1314,6 @@
13141314
<artifactId>tomcat-embed-jasper</artifactId>
13151315
<version>${tomcat.version}</version>
13161316
</dependency>
1317-
<dependency>
1318-
<groupId>org.apache.tomcat.embed</groupId>
1319-
<artifactId>tomcat-embed-logging-juli</artifactId>
1320-
<version>${tomcat.version}</version>
1321-
</dependency>
13221317
<dependency>
13231318
<groupId>org.apache.tomcat.embed</groupId>
13241319
<artifactId>tomcat-embed-websocket</artifactId>
@@ -1334,6 +1329,11 @@
13341329
<artifactId>tomcat-jsp-api</artifactId>
13351330
<version>${tomcat.version}</version>
13361331
</dependency>
1332+
<dependency>
1333+
<groupId>org.apache.tomcat</groupId>
1334+
<artifactId>tomcat-juli</artifactId>
1335+
<version>${tomcat.version}</version>
1336+
</dependency>
13371337
<dependency>
13381338
<groupId>org.apache.velocity</groupId>
13391339
<artifactId>velocity</artifactId>

‎spring-boot-devtools/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>
121-
<groupId>org.apache.tomcat.embed</groupId>
122-
<artifactId>tomcat-embed-logging-juli</artifactId>
121+
<groupId>org.apache.tomcat</groupId>
122+
<artifactId>tomcat-juli</artifactId>
123123
<scope>test</scope>
124124
</dependency>
125125
<dependency>

‎spring-boot-docs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@
300300
<optional>true</optional>
301301
</dependency>
302302
<dependency>
303-
<groupId>org.apache.tomcat.embed</groupId>
304-
<artifactId>tomcat-embed-logging-juli</artifactId>
303+
<groupId>org.apache.tomcat</groupId>
304+
<artifactId>tomcat-juli</artifactId>
305305
<optional>true</optional>
306306
</dependency>
307307
<dependency>

‎spring-boot-samples/README.adoc

+7-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ The following sample applications are provided:
193193
| Embedded Tomcat
194194

195195
| link:spring-boot-sample-tomcat-jsp[spring-boot-sample-tomcat-jsp]
196-
| Web application that uses JSP templates with Tomcat 8
196+
| Web application that uses JSP templates with Tomcat
197197

198198
| link:spring-boot-sample-tomcat-multi-connectors[spring-boot-sample-tomcat-multi-connectors]
199199
| Web application that uses Tomcat configured with multiple connectors
@@ -204,6 +204,12 @@ The following sample applications are provided:
204204
| link:spring-boot-sample-tomcat7-jsp[spring-boot-sample-tomcat7-jsp]
205205
| Web application that uses JSP templates with Tomcat 7
206206

207+
| link:spring-boot-sample-tomcat7-ssl[spring-boot-sample-tomcat7-ssl]
208+
| Web application that uses Tomcat 7 configured with SSL
209+
210+
| link:spring-boot-sample-tomcat80-ssl[spring-boot-sample-tomcat80-ssl]
211+
| Web application that uses Tomcat 8.0 configured with SSL
212+
207213
| link:spring-boot-sample-traditional[spring-boot-sample-traditional]
208214
| Traditional WAR packaging (but also executable using `java -jar`)
209215

‎spring-boot-samples/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
<module>spring-boot-sample-tomcat-ssl</module>
8888
<module>spring-boot-sample-tomcat-multi-connectors</module>
8989
<module>spring-boot-sample-tomcat7-jsp</module>
90+
<module>spring-boot-sample-tomcat7-ssl</module>
91+
<module>spring-boot-sample-tomcat80-ssl</module>
9092
<module>spring-boot-sample-traditional</module>
9193
<module>spring-boot-sample-undertow</module>
9294
<module>spring-boot-sample-undertow-ssl</module>

‎spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<properties>
2020
<main.basedir>${basedir}/../..</main.basedir>
2121
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
22+
<tomcat.version>7.0.69</tomcat.version>
2223
</properties>
2324
<dependencies>
2425
<dependency>

‎spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>1.4.0.BUILD-SNAPSHOT</version>
99
</parent>
1010
<artifactId>spring-boot-sample-tomcat-ssl</artifactId>
11-
<name>Spring Boot Tomcat Sample</name>
11+
<name>Spring Boot Tomcat SSL Sample</name>
1212
<description>Spring Boot Tomcat SSL Sample</description>
1313
<url>http://projects.spring.io/spring-boot/</url>
1414
<organization>

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/pom.xml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<!-- Your own application should inherit from spring-boot-starter-parent -->
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-samples</artifactId>
8+
<version>1.4.0.BUILD-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>spring-boot-sample-tomcat7-ssl</artifactId>
11+
<name>Spring Boot Tomcat 7 SSL Sample</name>
12+
<description>Spring Boot Tomcat 7 SSL Sample</description>
13+
<url>http://projects.spring.io/spring-boot/</url>
14+
<organization>
15+
<name>Pivotal Software, Inc.</name>
16+
<url>http://www.spring.io</url>
17+
</organization>
18+
<properties>
19+
<main.basedir>${basedir}/../..</main.basedir>
20+
<tomcat.version>7.0.69</tomcat.version>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter-tomcat</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework</groupId>
33+
<artifactId>spring-webmvc</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.httpcomponents</groupId>
37+
<artifactId>httpclient</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-test</artifactId>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.yaml</groupId>
46+
<artifactId>snakeyaml</artifactId>
47+
</dependency>
48+
</dependencies>
49+
<build>
50+
<plugins>
51+
<plugin>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-maven-plugin</artifactId>
54+
</plugin>
55+
</plugins>
56+
</build>
57+
</project>

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2012-2015 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package sample.tomcat.ssl;
18+
19+
import org.springframework.boot.SpringApplication;
20+
import org.springframework.boot.autoconfigure.SpringBootApplication;
21+
22+
@SpringBootApplication
23+
public class SampleTomcatSslApplication {
24+
25+
public static void main(String[] args) throws Exception {
26+
SpringApplication.run(SampleTomcatSslApplication.class, args);
27+
}
28+
29+
}

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright 2012-2016 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package sample.tomcat.ssl.web;
18+
19+
import org.springframework.stereotype.Controller;
20+
import org.springframework.web.bind.annotation.GetMapping;
21+
import org.springframework.web.bind.annotation.ResponseBody;
22+
23+
@Controller
24+
public class SampleController {
25+
26+
@GetMapping("/")
27+
@ResponseBody
28+
public String helloWorld() {
29+
return "Hello, world";
30+
}
31+
32+
}

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/src/main/resources/application.properties

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
server.port = 8443
2+
server.ssl.key-store = classpath:sample.jks
3+
server.ssl.key-store-password = secret
4+
server.ssl.key-password = password

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/src/main/resources/sample.jks

2.21 KB
Binary file not shown.

‎spring-boot-samples/spring-boot-sample-tomcat7-ssl/src/test/java/sample/tomcat/ssl/SampleTomcatSslApplicationTests.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright 2012-2016 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package sample.tomcat.ssl;
18+
19+
import org.junit.Test;
20+
import org.junit.runner.RunWith;
21+
22+
import org.springframework.boot.context.embedded.LocalServerPort;
23+
import org.springframework.boot.test.context.SpringBootTest;
24+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
25+
import org.springframework.boot.test.web.client.TestRestTemplate;
26+
import org.springframework.boot.test.web.client.TestRestTemplate.HttpClientOption;
27+
import org.springframework.http.HttpStatus;
28+
import org.springframework.http.ResponseEntity;
29+
import org.springframework.test.annotation.DirtiesContext;
30+
import org.springframework.test.context.junit4.SpringRunner;
31+
32+
import static org.assertj.core.api.Assertions.assertThat;
33+
34+
@RunWith(SpringRunner.class)
35+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
36+
@DirtiesContext
37+
public class SampleTomcatSslApplicationTests {
38+
39+
@LocalServerPort
40+
private int port;
41+
42+
@Test
43+
public void testHome() throws Exception {
44+
TestRestTemplate testRestTemplate = new TestRestTemplate(HttpClientOption.SSL);
45+
ResponseEntity<String> entity = testRestTemplate
46+
.getForEntity("https://localhost:" + this.port, String.class);
47+
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
48+
assertThat(entity.getBody()).isEqualTo("Hello, world");
49+
}
50+
51+
}

‎spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<!-- Your own application should inherit from spring-boot-starter-parent -->
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-samples</artifactId>
8+
<version>1.4.0.BUILD-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>spring-boot-sample-tomcat-ssl</artifactId>
11+
<name>Spring Boot Tomcat 8.0 SSL Sample</name>
12+
<description>Spring Boot Tomcat 8.0 SSL Sample</description>
13+
<url>http://projects.spring.io/spring-boot/</url>
14+
<organization>
15+
<name>Pivotal Software, Inc.</name>
16+
<url>http://www.spring.io</url>
17+
</organization>
18+
<properties>
19+
<main.basedir>${basedir}/../..</main.basedir>
20+
<tomcat.version>8.0.33</tomcat.version>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter-tomcat</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework</groupId>
33+
<artifactId>spring-webmvc</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.httpcomponents</groupId>
37+
<artifactId>httpclient</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-test</artifactId>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.yaml</groupId>
46+
<artifactId>snakeyaml</artifactId>
47+
</dependency>
48+
</dependencies>
49+
<build>
50+
<plugins>
51+
<plugin>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-maven-plugin</artifactId>
54+
</plugin>
55+
</plugins>
56+
</build>
57+
</project>

‎spring-boot-samples/spring-boot-sample-tomcat80-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2012-2015 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package sample.tomcat.ssl;
18+
19+
import org.springframework.boot.SpringApplication;
20+
import org.springframework.boot.autoconfigure.SpringBootApplication;
21+
22+
@SpringBootApplication
23+
public class SampleTomcatSslApplication {
24+
25+
public static void main(String[] args) throws Exception {
26+
SpringApplication.run(SampleTomcatSslApplication.class, args);
27+
}
28+
29+
}

0 commit comments

Comments
 (0)