fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-43377
This commit is contained in:
Stéphane Nicoll 2024-12-04 10:57:58 +01:00
commit 60b028e7cb
25 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
View File

@ -34,22 +34,22 @@
<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/> <ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
</Filters> </Filters>
<Policies> <Policies>
<SizeBasedTriggeringPolicy size="10 MB" /> <SizeBasedTriggeringPolicy size="10 MB"/>
</Policies> </Policies>
</RollingFile> </RollingFile>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" 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.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console" /> <AppenderRef ref="Console"/>
<AppenderRef ref="File" /> <AppenderRef ref="File"/>
</Root> </Root>
</Loggers> </Loggers>
</Configuration> </Configuration>

24
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
View File

@ -17,22 +17,22 @@
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/> <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
</DefaultArbiter> </DefaultArbiter>
</Select> </Select>
<filters> <Filters>
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/> <ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
</filters> </Filters>
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" 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.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console" /> <AppenderRef ref="Console"/>
</Root> </Root>
</Loggers> </Loggers>
</Configuration> </Configuration>

10
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
View File

@ -5,12 +5,12 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
--> -->
<included> <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}"/> <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/console-appender.xml"/>
<include resource="org/springframework/boot/logging/logback/file-appender.xml" /> <include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE" /> <appender-ref ref="FILE"/>
</root> </root>
</included> </included>

8
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
View File

@ -5,10 +5,10 @@ Default logback configuration provided for import
--> -->
<included> <included>
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter" /> <conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter"/>
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" /> <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter" /> <conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter"/>
<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" /> <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.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />

2
spring-boot-project/spring-boot/src/test/resources/logback-broken.xml
View File

@ -6,6 +6,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml
View File

@ -7,6 +7,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-janino.xml
View File

@ -13,6 +13,6 @@
</filter> </filter>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml
View File

@ -6,6 +6,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml
View File

@ -7,7 +7,7 @@
</appender> </appender>
<root level="INFO"> <root level="INFO">
<springProfile name="profile"> <springProfile name="profile">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</springProfile> </springProfile>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-without-extension
View File

@ -6,6 +6,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml
View File

@ -1,5 +1,5 @@
<included> <included>
<springProfile name="production"> <springProfile name="production">
<logger name="org.springframework.boot.logging.logback" level="TRACE" /> <logger name="org.springframework.boot.logging.logback" level="TRACE"/>
</springProfile> </springProfile>
</included> </included>

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml
View File

@ -1,3 +1,3 @@
<included> <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> </included>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<springProfile name="production, test"> <springProfile name="production, test">
<logger name="org.springframework.boot.logging.logback" level="TRACE" /> <logger name="org.springframework.boot.logging.logback" level="TRACE"/>
</springProfile> </springProfile>
</configuration> </configuration>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<springProfile name="outer"> <springProfile name="outer">
<springProfile name="inner"> <springProfile name="inner">
<logger name="org.springframework.boot.logging.logback" level="TRACE" /> <logger name="org.springframework.boot.logging.logback" level="TRACE"/>
</springProfile> </springProfile>
</springProfile> </springProfile>
</configuration> </configuration>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<springProfile name="production"> <springProfile name="production">
<logger name="org.springframework.boot.logging.logback" level="TRACE" /> <logger name="org.springframework.boot.logging.logback" level="TRACE"/>
</springProfile> </springProfile>
</configuration> </configuration>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<springProfile name="production | test"> <springProfile name="production | test">
<logger name="org.springframework.boot.logging.logback" level="TRACE" /> <logger name="org.springframework.boot.logging.logback" level="TRACE"/>
</springProfile> </springProfile>
</configuration> </configuration>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <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/include-with-profile.xml"/>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <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="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/>
<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/> <springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/>
</configuration> </configuration>

6
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<springProperty scope="context" name="MINE" source="my.example-property" /> <springProperty scope="context" name="MINE" source="my.example-property"/>
<if condition='property("MINE").contains("true")'> <if condition='property("MINE").contains("true")'>
<then> <then>
<variable scope="context" name="MYCHECK" value="i-was-included" /> <variable scope="context" name="MYCHECK" value="i-was-included"/>
</then> </then>
</if> </if>
</configuration> </configuration>

4
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <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/include-with-property.xml"/>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <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="SIMPLE" source="testpropertyfoobar"/>
<springProperty scope="context" name="MINE" source="my.example-property"/> <springProperty scope="context" name="MINE" source="my.example-property"/>
</configuration> </configuration>

2
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml
View File

@ -5,6 +5,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT"/>
</root> </root>
</configuration> </configuration>

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
View File

@ -10,9 +10,9 @@
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.hibernate.validator.internal.util.Version" 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.coyote.http11.Http11NioProtocol" level="warn"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn"/>
<Root level="info"> <Root level="info">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<logger name="smoketest.logback" level="DEBUG" /> <logger name="smoketest.logback" level="DEBUG"/>
<springProfile name="staging"> <springProfile name="staging">
<logger name="smoketest.logback" level="TRACE" /> <logger name="smoketest.logback" level="TRACE"/>
</springProfile> </springProfile>
</configuration> </configuration>