Skip to content

Commit 60b028e

Browse files
snicollsnicoll
committed
Merge branch '3.3.x'
Closes spring-projectsgh-43377
2 parents 4b09564 + 3f346d4 commit 60b028e

File tree

25 files changed

+67
-67
lines changed

25 files changed

+67
-67
lines changed

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@
3434
<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
3535
</Filters>
3636
<Policies>
37-
<SizeBasedTriggeringPolicy size="10 MB" />
37+
<SizeBasedTriggeringPolicy size="10 MB"/>
3838
</Policies>
3939
</RollingFile>
4040
</Appenders>
4141
<Loggers>
42-
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
43-
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
44-
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
45-
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
46-
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
47-
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
48-
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
49-
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
50-
<Root level="info">
51-
<AppenderRef ref="Console" />
52-
<AppenderRef ref="File" />
42+
<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
43+
<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
44+
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
45+
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
46+
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
47+
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
48+
<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
49+
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
50+
<Root level="INFO">
51+
<AppenderRef ref="Console"/>
52+
<AppenderRef ref="File"/>
5353
</Root>
5454
</Loggers>
5555
</Configuration>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
1818
</DefaultArbiter>
1919
</Select>
20-
<filters>
20+
<Filters>
2121
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
22-
</filters>
22+
</Filters>
2323
</Console>
2424
</Appenders>
2525
<Loggers>
26-
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
27-
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
28-
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
29-
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
30-
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
31-
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
32-
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
33-
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
34-
<Root level="info">
35-
<AppenderRef ref="Console" />
26+
<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
27+
<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
28+
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
29+
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
30+
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
31+
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
32+
<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
33+
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
34+
<Root level="INFO">
35+
<AppenderRef ref="Console"/>
3636
</Root>
3737
</Loggers>
3838
</Configuration>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
55
-->
66

77
<included>
8-
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
8+
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
99
<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>
10-
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
11-
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
10+
<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
11+
<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
1212
<root level="INFO">
13-
<appender-ref ref="CONSOLE" />
14-
<appender-ref ref="FILE" />
13+
<appender-ref ref="CONSOLE"/>
14+
<appender-ref ref="FILE"/>
1515
</root>
1616
</included>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Default logback configuration provided for import
55
-->
66

77
<included>
8-
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter" />
9-
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
10-
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter" />
11-
<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" />
8+
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter"/>
9+
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
10+
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter"/>
11+
<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" />
1212
<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
1313
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
1414

‎spring-boot-project/spring-boot/src/test/resources/logback-broken.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</encoder>
77
</appender>
88
<root level="INFO">
9-
<appender-ref ref="CONSOLE" />
9+
<appender-ref ref="CONSOLE"/>
1010
</root>
1111
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</encoder>
88
</appender>
99
<root level="INFO">
10-
<appender-ref ref="CONSOLE" />
10+
<appender-ref ref="CONSOLE"/>
1111
</root>
1212
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-janino.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</filter>
1414
</appender>
1515
<root level="INFO">
16-
<appender-ref ref="CONSOLE" />
16+
<appender-ref ref="CONSOLE"/>
1717
</root>
1818
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</encoder>
77
</appender>
88
<root level="INFO">
9-
<appender-ref ref="CONSOLE" />
9+
<appender-ref ref="CONSOLE"/>
1010
</root>
1111
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</appender>
88
<root level="INFO">
99
<springProfile name="profile">
10-
<appender-ref ref="CONSOLE" />
10+
<appender-ref ref="CONSOLE"/>
1111
</springProfile>
1212
</root>
1313
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-without-extension

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</encoder>
77
</appender>
88
<root level="INFO">
9-
<appender-ref ref="CONSOLE" />
9+
<appender-ref ref="CONSOLE"/>
1010
</root>
1111
</configuration>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<included>
22
<springProfile name="production">
3-
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
3+
<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
44
</springProfile>
55
</included>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<included>
2-
<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test" />
2+
<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test"/>
33
</included>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProfile name="production, test">
5-
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
5+
<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
66
</springProfile>
77
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProfile name="outer">
55
<springProfile name="inner">
6-
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
6+
<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
77
</springProfile>
88
</springProfile>
99
</configuration>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProfile name="production">
5-
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
5+
<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
66
</springProfile>
77
</configuration>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProfile name="production | test">
5-
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
5+
<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
66
</springProfile>
77
</configuration>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
4-
<include resource="org/springframework/boot/logging/logback/include-with-profile.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4+
<include resource="org/springframework/boot/logging/logback/include-with-profile.xml"/>
55
</configuration>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/>
55
<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/>
66
</configuration>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
4-
<springProperty scope="context" name="MINE" source="my.example-property" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4+
<springProperty scope="context" name="MINE" source="my.example-property"/>
55
<if condition='property("MINE").contains("true")'>
66
<then>
7-
<variable scope="context" name="MYCHECK" value="i-was-included" />
7+
<variable scope="context" name="MYCHECK" value="i-was-included"/>
88
</then>
99
</if>
1010
</configuration>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
4-
<include resource="org/springframework/boot/logging/logback/include-with-property.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4+
<include resource="org/springframework/boot/logging/logback/include-with-property.xml"/>
55
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar"/>
55
<springProperty scope="context" name="MINE" source="my.example-property"/>
66
</configuration>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</encoder>
66
</appender>
77
<root level="INFO">
8-
<appender-ref ref="STDOUT" />
8+
<appender-ref ref="STDOUT"/>
99
</root>
1010
</configuration>

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</Console>
1111
</Appenders>
1212
<Loggers>
13-
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
14-
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
15-
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
13+
<Logger name="org.hibernate.validator.internal.util.Version" level="warn"/>
14+
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn"/>
15+
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn"/>
1616

1717
<Root level="info">
1818
<AppenderRef ref="Console"/>

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
44
<root level="INFO">
5-
<appender-ref ref="CONSOLE" />
5+
<appender-ref ref="CONSOLE"/>
66
</root>
77
</configuration>

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<include resource="org/springframework/boot/logging/logback/base.xml" />
4-
<logger name="smoketest.logback" level="DEBUG" />
3+
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4+
<logger name="smoketest.logback" level="DEBUG"/>
55
<springProfile name="staging">
6-
<logger name="smoketest.logback" level="TRACE" />
6+
<logger name="smoketest.logback" level="TRACE"/>
77
</springProfile>
88
</configuration>

0 commit comments

Comments
 (0)