Merge branch '3.3.x'

Closes gh-43377
spring-projects · Dec 4, 2024 · 60b028e · 60b028e
2 parents 4b09564 + 3f346d4
commit 60b028e
Show file tree

Hide file tree

Showing 25 changed files with 67 additions and 67 deletions.
diff --git a/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml b/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
@@ -34,22 +34,22 @@
 				<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
 			</Filters>
 			<Policies>
-				<SizeBasedTriggeringPolicy size="10 MB" />
+				<SizeBasedTriggeringPolicy size="10 MB"/>
 			</Policies>
 		</RollingFile>
 	</Appenders>
 	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		<Root level="info">
-			<AppenderRef ref="Console" />
-			<AppenderRef ref="File" />
+		<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
+		<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
+		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
+		<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
+		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
+		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
+		<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
+		<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
+		<Root level="INFO">
+			<AppenderRef ref="Console"/>
+			<AppenderRef ref="File"/>
 		</Root>
 	</Loggers>
 </Configuration>
diff --git a/...project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml b/...project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
@@ -17,22 +17,22 @@
 					<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
 				</DefaultArbiter>
 			</Select>
-			<filters>
+			<Filters>
 				<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
-			</filters>
+			</Filters>
 		</Console>
 	</Appenders>
 	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		<Root level="info">
-			<AppenderRef ref="Console" />
+		<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
+		<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
+		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
+		<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
+		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
+		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
+		<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
+		<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
+		<Root level="INFO">
+			<AppenderRef ref="Console"/>
 		</Root>
 	</Loggers>
 </Configuration>
diff --git a/...-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml b/...-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
@@ -5,12 +5,12 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
 -->
 
 <included>
-	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
+	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 	<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>
-	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
-	<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+	<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+	<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
-		<appender-ref ref="FILE" />
+		<appender-ref ref="CONSOLE"/>
+		<appender-ref ref="FILE"/>
 	</root>
 </included>
diff --git a/...ject/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml b/...ject/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
@@ -5,10 +5,10 @@ Default logback configuration provided for import
 -->
 
 <included>
-	<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter" />
-	<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter" />
-	<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" />
+	<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter"/>
+	<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter"/>
+	<conversionRule  conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" />
 	<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 	<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
 

diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-broken.xml b/spring-boot-project/spring-boot/src/test/resources/logback-broken.xml
@@ -6,6 +6,6 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml b/spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml
@@ -7,6 +7,6 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-janino.xml b/spring-boot-project/spring-boot/src/test/resources/logback-janino.xml
@@ -13,6 +13,6 @@
 		</filter>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml b/spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml
@@ -6,6 +6,6 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml b/spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml
@@ -7,7 +7,7 @@
 	</appender>
 	<root level="INFO">
 		<springProfile name="profile">
-			<appender-ref ref="CONSOLE" />
+			<appender-ref ref="CONSOLE"/>
 		</springProfile>
 	</root>
 </configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-without-extension b/spring-boot-project/spring-boot/src/test/resources/logback-without-extension
@@ -6,6 +6,6 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/...boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml b/...boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml
@@ -1,5 +1,5 @@
 <included>
 	<springProfile name="production">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
 	</springProfile>
 </included>
diff --git a/...oot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml b/...oot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml
@@ -1,3 +1,3 @@
 <included>
-	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test" />
+	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test"/>
 </included>
diff --git a/...-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml b/...-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProfile name="production, test">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
 	</springProfile>
 </configuration>
diff --git a/...roject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml b/...roject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProfile name="outer">
 		<springProfile name="inner">
-			<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+			<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
 		</springProfile>
 	</springProfile>
 </configuration>
diff --git a/...g-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml b/...g-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProfile name="production">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
 	</springProfile>
 </configuration>
diff --git a/...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml b/...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProfile name="production | test">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
 	</springProfile>
 </configuration>
diff --git a/...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml b/...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-	<include resource="org/springframework/boot/logging/logback/include-with-profile.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<include resource="org/springframework/boot/logging/logback/include-with-profile.xml"/>
 </configuration>
diff --git a/...ot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml b/...ot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/>
 	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/>
 </configuration>
diff --git a/...pring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml b/...pring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-	<springProperty scope="context" name="MINE" source="my.example-property" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<springProperty scope="context" name="MINE" source="my.example-property"/>
 	<if condition='property("MINE").contains("true")'>
 		<then>
-			<variable scope="context" name="MYCHECK" value="i-was-included" />
+			<variable scope="context" name="MYCHECK" value="i-was-included"/>
 		</then>
 	</if>
 </configuration>
diff --git a/...-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml b/...-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-	<include resource="org/springframework/boot/logging/logback/include-with-property.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<include resource="org/springframework/boot/logging/logback/include-with-property.xml"/>
 </configuration>
diff --git a/...ject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml b/...ject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar"/>
 	<springProperty scope="context" name="MINE" source="my.example-property"/>
 </configuration>
diff --git a/...ot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml b/...ot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml
@@ -5,6 +5,6 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="STDOUT" />
+		<appender-ref ref="STDOUT"/>
 	</root>
 </configuration>
diff --git a/...ing-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml b/...ing-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
@@ -10,9 +10,9 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
+        <Logger name="org.hibernate.validator.internal.util.Version" level="warn"/>
+        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn"/>
+        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn"/>
 
         <Root level="info">
             <AppenderRef ref="Console"/>

diff --git a/...ts/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml b/...ts/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
diff --git a/...ing-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml b/...ing-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-	<logger name="smoketest.logback" level="DEBUG" />
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<logger name="smoketest.logback" level="DEBUG"/>
 	<springProfile name="staging">
-		<logger name="smoketest.logback" level="TRACE" />
+		<logger name="smoketest.logback" level="TRACE"/>
 	</springProfile>
 </configuration>