Merge branch '2.2.x' into 2.3.x

Closes gh-22282
spring-projects · Jul 9, 2020 · c765df6 · c765df6
2 parents 888bea5 + afa5b12
commit c765df6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...pringframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java b/...pringframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java
@@ -19,6 +19,7 @@
 import java.util.stream.Collectors;
 
 import io.undertow.Undertow;
+import org.eclipse.jetty.servlet.ServletHolder;
 import reactor.netty.http.server.HttpServer;
 
 import org.springframework.beans.factory.ObjectProvider;
@@ -100,7 +101,7 @@ TomcatReactiveWebServerFactory tomcatReactiveWebServerFactory(
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(ReactiveWebServerFactory.class)
-	@ConditionalOnClass({ org.eclipse.jetty.server.Server.class })
+	@ConditionalOnClass({ org.eclipse.jetty.server.Server.class, ServletHolder.class })
 	static class EmbeddedJetty {
 
 		@Bean