Merge branch '2.4.x' into 2.5.x

Closes gh-28734
4 years ago · 88457d9cfa
1 changed files with 4 additions and 0 deletions
--- a/spring-boot-tests/spring-boot-deployment-tests/src/intTest/resources/logback.xml
+++ b/spring-boot-tests/spring-boot-deployment-tests/src/intTest/resources/logback.xml
@ -0,0 +1,4 @@
				@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+</configuration>