Merge branch '2.5.x'

See gh-28377
spring-projects · Oct 19, 2021 · 14fb9c4 · 14fb9c4
2 parents 89b40e1 + bc2bf84
commit 14fb9c4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.../java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfiguration.java b/.../java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfiguration.java
@@ -28,6 +28,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
 import org.springframework.boot.devtools.autoconfigure.DevToolsR2dbcAutoConfiguration.DevToolsConnectionFactoryCondition;
@@ -49,6 +50,7 @@
  * @since 2.5.6
  */
 @AutoConfigureAfter(R2dbcAutoConfiguration.class)
+@ConditionalOnClass(ConnectionFactory.class)
 @Conditional({ OnEnabledDevToolsCondition.class, DevToolsConnectionFactoryCondition.class })
 @Configuration(proxyBeanMethods = false)
 public class DevToolsR2dbcAutoConfiguration {