mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.2.x' into 2.3.x
Closes gh-22282
This commit is contained in:
commit
c765df6e5d
@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.web.reactive;
|
||||
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 @@ abstract class ReactiveWebServerFactoryConfiguration {
|
||||
|
||||
@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
|
||||
|
Loading…
Reference in New Issue
Block a user