From da12ad0ca5366fb7f8814d6518e1a45609362a36 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 22 May 2019 12:33:59 +0100
Subject: [PATCH] Make ReactiveSecurityAutoConfiguration back off without
 spring-webflux

Closes gh-16934
---
 .../reactive/ReactiveSecurityAutoConfiguration.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java
index f87470ab38..8058fc7315 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -27,6 +27,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.web.server.WebFilterChainProxy;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Security in a reactive
@@ -40,8 +41,8 @@ import org.springframework.security.web.server.WebFilterChainProxy;
  */
 @Configuration
 @EnableConfigurationProperties(SecurityProperties.class)
-@ConditionalOnClass({ Flux.class, EnableWebFluxSecurity.class,
-		WebFilterChainProxy.class })
+@ConditionalOnClass({ Flux.class, EnableWebFluxSecurity.class, WebFilterChainProxy.class,
+		WebFluxConfigurer.class })
 public class ReactiveSecurityAutoConfiguration {
 
 	@Configuration