mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Make reactive Jetty auto-config back off without jetty-servlet
Fixes gh-22275
This commit is contained in:
parent
efad6c16d1
commit
afa5b12bdb
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -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