Skip to content

Commit 95027e7

Browse files
wilkinsonawilkinsona
committed
Create beginnings of spring-boot-tomcat module
1 parent f533ba7 commit 95027e7

File tree

122 files changed

+235
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+235
-187
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ include "spring-boot-project:spring-boot-docs"
6767
include "spring-boot-project:spring-boot-test"
6868
include "spring-boot-project:spring-boot-testcontainers"
6969
include "spring-boot-project:spring-boot-test-autoconfigure"
70+
include "spring-boot-project:spring-boot-tomcat"
7071
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
7172
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
7273
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dependencies {
1717
implementation("com.fasterxml.jackson.core:jackson-databind")
1818
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
1919

20+
optional(project(":spring-boot-project:spring-boot-tomcat"))
2021
optional("ch.qos.logback:logback-classic")
2122
optional("org.apache.cassandra:java-driver-core") {
2223
exclude group: "org.slf4j", module: "jcl-over-slf4j"

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
31+
import org.springframework.boot.tomcat.TomcatWebServer;
3132
import org.springframework.context.annotation.Bean;
3233

3334
/**
@@ -38,7 +39,7 @@
3839
*/
3940
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
4041
@ConditionalOnWebApplication
41-
@ConditionalOnClass({ TomcatMetrics.class, Manager.class })
42+
@ConditionalOnClass({ TomcatMetrics.class, Manager.class, TomcatWebServer.class })
4243
public class TomcatMetricsAutoConfiguration {
4344

4445
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/tomcat/TomcatAccessLogCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.catalina.valves.AccessLogValve;
2424

2525
import org.springframework.boot.actuate.autoconfigure.web.server.AccessLogCustomizer;
26-
import org.springframework.boot.web.server.tomcat.ConfigurableTomcatWebServerFactory;
26+
import org.springframework.boot.tomcat.ConfigurableTomcatWebServerFactory;
2727

2828
/**
2929
* {@link AccessLogCustomizer} for Tomcat.

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/tomcat/TomcatReactiveManagementChildContextConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27-
import org.springframework.boot.web.server.reactive.tomcat.TomcatReactiveWebServerFactory;
27+
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
2828
import org.springframework.context.annotation.Bean;
2929

3030
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/tomcat/TomcatServletManagementChildContextConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
27+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2828
import org.springframework.context.annotation.Bean;
2929

3030
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
4545
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointDiscoverer;
4646
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
47-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
47+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4848
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4949
import org.springframework.context.ApplicationContext;
5050
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.junit.jupiter.api.Test;
2323

2424
import org.springframework.boot.testsupport.web.servlet.ExampleServlet;
25+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2526
import org.springframework.boot.web.server.Ssl;
2627
import org.springframework.boot.web.server.WebServer;
27-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
2828
import org.springframework.boot.web.servlet.ServletRegistrationBean;
2929
import org.springframework.http.HttpStatus;
3030
import org.springframework.http.ResponseEntity;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.boot.test.context.SpringBootTest;
3434
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3535
import org.springframework.boot.test.web.server.LocalServerPort;
36-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
36+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
3737
import org.springframework.context.ConfigurableApplicationContext;
3838
import org.springframework.context.annotation.Bean;
3939
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
import org.springframework.boot.context.event.ApplicationStartedEvent;
3434
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3535
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
36+
import org.springframework.boot.tomcat.TomcatWebServer;
37+
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
38+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
3639
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
37-
import org.springframework.boot.web.server.reactive.tomcat.TomcatReactiveWebServerFactory;
38-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
39-
import org.springframework.boot.web.server.tomcat.TomcatWebServer;
4040
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4141
import org.springframework.context.ConfigurableApplicationContext;
4242
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3939
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
4040
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
41+
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
4142
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
42-
import org.springframework.boot.web.server.reactive.tomcat.TomcatReactiveWebServerFactory;
4343
import org.springframework.context.annotation.Bean;
4444
import org.springframework.context.annotation.Configuration;
4545
import org.springframework.http.HttpMethod;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2626
import org.springframework.boot.test.context.FilteredClassLoader;
2727
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
28-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
28+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2929
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2727
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
28-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
28+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2929
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementChildContextConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
4545
import org.springframework.boot.test.context.runner.ContextConsumer;
4646
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
47+
import org.springframework.boot.tomcat.TomcatWebServer;
4748
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
4849
import org.springframework.boot.web.context.WebServerInitializedEvent;
4950
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
5051
import org.springframework.boot.web.server.WebServer;
51-
import org.springframework.boot.web.server.tomcat.TomcatWebServer;
5252
import org.springframework.context.ApplicationListener;
5353
import org.springframework.context.ConfigurableApplicationContext;
5454
import org.springframework.core.convert.support.ConfigurableConversionService;

‎spring-boot-project/spring-boot-actuator/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies {
2323
dockerTestImplementation("org.testcontainers:neo4j")
2424
dockerTestImplementation("org.testcontainers:testcontainers")
2525

26+
optional(project(":spring-boot-project:spring-boot-tomcat"))
2627
optional("org.apache.cassandra:java-driver-core") {
2728
exclude group: "org.slf4j", module: "jcl-over-slf4j"
2829
}

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
import org.springframework.beans.factory.DisposableBean;
2929
import org.springframework.boot.context.event.ApplicationStartedEvent;
30+
import org.springframework.boot.tomcat.TomcatWebServer;
3031
import org.springframework.boot.web.context.WebServerApplicationContext;
3132
import org.springframework.boot.web.server.WebServer;
32-
import org.springframework.boot.web.server.tomcat.TomcatWebServer;
3333
import org.springframework.context.ApplicationContext;
3434
import org.springframework.context.ApplicationListener;
3535

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
import org.apache.catalina.Context;
2727
import org.apache.catalina.core.StandardWrapper;
2828

29+
import org.springframework.boot.tomcat.TomcatWebServer;
2930
import org.springframework.boot.web.server.WebServer;
3031
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServer;
31-
import org.springframework.boot.web.server.tomcat.TomcatWebServer;
3232
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
33+
import org.springframework.util.ClassUtils;
3334
import org.springframework.web.context.WebApplicationContext;
3435
import org.springframework.web.servlet.DispatcherServlet;
3536
import org.springframework.web.servlet.HandlerMapping;
@@ -43,6 +44,10 @@
4344
*/
4445
final class DispatcherServletHandlerMappings {
4546

47+
private static final boolean TOMCAT_WEB_SERVER_PRESENT = ClassUtils.isPresent(
48+
"org.springframework.boot.web.server.tomcat.TomcatWebServer",
49+
DispatcherServletHandlerMappings.class.getClassLoader());
50+
4651
private final String name;
4752

4853
private final DispatcherServlet dispatcherServlet;
@@ -73,7 +78,7 @@ private void initializeDispatcherServletIfPossible() {
7378
if (webServer instanceof UndertowServletWebServer undertowServletWebServer) {
7479
new UndertowServletInitializer(undertowServletWebServer).initializeServlet(this.name);
7580
}
76-
else if (webServer instanceof TomcatWebServer tomcatWebServer) {
81+
else if (TOMCAT_WEB_SERVER_PRESENT && webServer instanceof TomcatWebServer tomcatWebServer) {
7782
new TomcatServletInitializer(tomcatWebServer).initializeServlet(this.name);
7883
}
7984
}

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/BaseConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper;
2626
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
2727
import org.springframework.boot.actuate.endpoint.web.PathMapper;
28-
import org.springframework.boot.web.server.tomcat.TomcatEmbeddedWebappClassLoader;
28+
import org.springframework.boot.tomcat.TomcatEmbeddedWebappClassLoader;
2929
import org.springframework.context.ApplicationContext;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
4141
import org.springframework.boot.actuate.endpoint.web.annotation.AbstractWebEndpointIntegrationTests;
4242
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointDiscoverer;
43-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
43+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4444
import org.springframework.boot.web.servlet.ServletRegistrationBean;
4545
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4646
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3939
import org.springframework.boot.test.context.runner.ContextConsumer;
4040
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
41-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
41+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4343
import org.springframework.context.ApplicationContext;
4444
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3939
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4040
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
41-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
41+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4343
import org.springframework.context.annotation.Bean;
4444
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
5656
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
5757
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
58+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
5859
import org.springframework.boot.web.context.WebServerInitializedEvent;
5960
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
6061
import org.springframework.boot.web.server.reactive.netty.NettyReactiveWebServerFactory;
61-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
6262
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
6363
import org.springframework.context.ApplicationContext;
6464
import org.springframework.context.ApplicationListener;

‎spring-boot-project/spring-boot-all/build.gradle

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,10 @@ plugins {
88

99
description = "Spring Boot All"
1010

11-
def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties")
12-
13-
configurations {
14-
tomcatDistribution
15-
}
16-
1711
dependencies {
1812
api(project(":spring-boot-project:spring-boot"))
1913
api("org.springframework:spring-core")
2014
api("org.springframework:spring-context")
21-
2215
optional("ch.qos.logback:logback-classic")
2316
optional("com.clickhouse:clickhouse-jdbc")
2417
optional("com.fasterxml.jackson.core:jackson-databind")
@@ -48,7 +41,6 @@ dependencies {
4841
optional("org.apache.logging.log4j:log4j-api")
4942
optional("org.apache.logging.log4j:log4j-core")
5043
optional("org.apache.logging.log4j:log4j-jul")
51-
optional("org.apache.tomcat.embed:tomcat-embed-core")
5244
optional("org.apache.tomcat.embed:tomcat-embed-jasper")
5345
optional("org.apache.tomcat:tomcat-jdbc")
5446
optional("org.assertj:assertj-core")
@@ -102,6 +94,7 @@ dependencies {
10294
exclude(group: "commons-logging", module: "commons-logging")
10395
}
10496

97+
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
10598
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
10699
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
107100
testImplementation("org.springframework:spring-core-test")
@@ -142,17 +135,6 @@ dependencies {
142135
exclude group: "javax.annotation", module: "javax.annotation-api"
143136
exclude group: "javax.xml.bind", module: "jaxb-api"
144137
}
145-
146-
tomcatDistribution("org.apache.tomcat:tomcat:${tomcatVersion}@zip")
147-
}
148-
149-
task extractTomcatConfigProperties(type: Sync) {
150-
destinationDir = file(tomcatConfigProperties)
151-
from {
152-
zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
153-
include '**/conf/catalina.properties'
154-
}.singleFile
155-
}
156138
}
157139

158140
def syncJavaTemplates = tasks.register("syncJavaTemplates", Sync) {
@@ -183,9 +165,6 @@ sourceSets {
183165
srcDirs syncJavaTemplates
184166
}
185167
}
186-
test {
187-
output.dir(tomcatConfigProperties, builtBy: "extractTomcatConfigProperties")
188-
}
189168
}
190169

191170
test {

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
import org.springframework.boot.web.server.servlet.ServletContextInitializers;
7676
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
7777
import org.springframework.boot.web.server.servlet.ServletWebServerSettings;
78-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
7978
import org.springframework.boot.web.server.undertow.HttpHandlerFactory;
8079
import org.springframework.boot.web.server.undertow.UndertowWebServerFactory;
8180
import org.springframework.context.ResourceLoaderAware;

‎spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ org.springframework.boot.reactor.ReactorEnvironmentPostProcessor
88

99
# Failure Analyzers
1010
org.springframework.boot.diagnostics.FailureAnalyzer=\
11-
org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer,\
12-
org.springframework.boot.web.server.tomcat.ConnectorStartFailureAnalyzer
11+
org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer
1312

1413
# Database Initializer Detectors
1514
org.springframework.boot.sql.init.dependency.DatabaseInitializerDetector=\

‎spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
import org.springframework.boot.ssl.jks.JksSslStoreDetails;
4343
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
4444
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
45+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4546
import org.springframework.boot.web.server.Ssl;
4647
import org.springframework.boot.web.server.Ssl.ClientAuth;
4748
import org.springframework.boot.web.server.WebServer;
48-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
4949
import org.springframework.http.HttpMethod;
5050
import org.springframework.http.HttpStatus;
5151
import org.springframework.http.client.ClientHttpRequest;

‎spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
import org.springframework.boot.ssl.jks.JksSslStoreDetails;
3939
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
4040
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
41+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
4142
import org.springframework.boot.web.server.Ssl;
4243
import org.springframework.boot.web.server.Ssl.ClientAuth;
4344
import org.springframework.boot.web.server.WebServer;
44-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
4545
import org.springframework.http.HttpMethod;
4646
import org.springframework.http.client.ClientHttpRequest;
4747
import org.springframework.http.client.ClientHttpRequestFactory;

‎spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
import org.springframework.boot.testsupport.classpath.resources.WithResource;
2525
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
26+
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2627
import org.springframework.boot.web.server.WebServer;
2728
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
2829
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
29-
import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
3030
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
3131
import org.springframework.boot.web.servlet.ServletRegistrationBean;
3232
import org.springframework.context.annotation.Bean;

0 commit comments

Comments
 (0)