diff --git a/spring-aop/src/test/resources/log4j2-test.xml b/spring-aop/src/test/resources/log4j2-test.xml
index 78b880bbcd8..521cc44e65a 100644
--- a/spring-aop/src/test/resources/log4j2-test.xml
+++ b/spring-aop/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-aspects/src/test/resources/log4j2-test.xml b/spring-aspects/src/test/resources/log4j2-test.xml
index f5e85a2eac8..fb1c94a4807 100644
--- a/spring-aspects/src/test/resources/log4j2-test.xml
+++ b/spring-aspects/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-beans/src/test/resources/log4j2-test.xml b/spring-beans/src/test/resources/log4j2-test.xml
index f5e85a2eac8..fb1c94a4807 100644
--- a/spring-beans/src/test/resources/log4j2-test.xml
+++ b/spring-beans/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-context-support/src/test/resources/log4j2-test.xml b/spring-context-support/src/test/resources/log4j2-test.xml
index ee1cd2ad04a..9f3f3485f5d 100644
--- a/spring-context-support/src/test/resources/log4j2-test.xml
+++ b/spring-context-support/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-context/src/test/resources/log4j2-test.xml b/spring-context/src/test/resources/log4j2-test.xml
index 29784b2f519..e17ae99cd08 100644
--- a/spring-context/src/test/resources/log4j2-test.xml
+++ b/spring-context/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-core/src/test/resources/log4j2-test.xml b/spring-core/src/test/resources/log4j2-test.xml
index dfacd8a87e9..37bbffbd708 100644
--- a/spring-core/src/test/resources/log4j2-test.xml
+++ b/spring-core/src/test/resources/log4j2-test.xml
@@ -2,10 +2,10 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 		<File name="File" fileName="build/logs/spring-test.log">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</File>
 	</Appenders>
 	<Loggers>
diff --git a/spring-expression/src/test/resources/log4j2-test.xml b/spring-expression/src/test/resources/log4j2-test.xml
index a617bb543ad..5c4984f0eb3 100644
--- a/spring-expression/src/test/resources/log4j2-test.xml
+++ b/spring-expression/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-instrument/src/test/resources/log4j2-test.xml b/spring-instrument/src/test/resources/log4j2-test.xml
index 4effcf32c91..d6de04caf42 100644
--- a/spring-instrument/src/test/resources/log4j2-test.xml
+++ b/spring-instrument/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-jdbc/src/test/resources/log4j2-test.xml b/spring-jdbc/src/test/resources/log4j2-test.xml
index 331b1f344df..d23e1b26868 100644
--- a/spring-jdbc/src/test/resources/log4j2-test.xml
+++ b/spring-jdbc/src/test/resources/log4j2-test.xml
@@ -2,10 +2,10 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 		<File name="File" fileName="build/logs/spring-jdbc.log">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</File>
 	</Appenders>
 	<Loggers>
diff --git a/spring-jms/src/test/resources/log4j2-test.xml b/spring-jms/src/test/resources/log4j2-test.xml
index 7ce30d928f3..3cbacdb4ff3 100644
--- a/spring-jms/src/test/resources/log4j2-test.xml
+++ b/spring-jms/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-messaging/src/test/resources/log4j2-test.xml b/spring-messaging/src/test/resources/log4j2-test.xml
index 67aae9ce2e5..0a2142f0d14 100644
--- a/spring-messaging/src/test/resources/log4j2-test.xml
+++ b/spring-messaging/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-orm/src/test/resources/log4j2-test.xml b/spring-orm/src/test/resources/log4j2-test.xml
index 2479a3ff3ab..35cd02a72e9 100644
--- a/spring-orm/src/test/resources/log4j2-test.xml
+++ b/spring-orm/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-oxm/src/test/resources/log4j2-test.xml b/spring-oxm/src/test/resources/log4j2-test.xml
index 81b17cc2219..2d38f4e71ce 100644
--- a/spring-oxm/src/test/resources/log4j2-test.xml
+++ b/spring-oxm/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-test/src/test/resources/log4j2-test.xml b/spring-test/src/test/resources/log4j2-test.xml
index bfcf311890b..db28ecb3db6 100644
--- a/spring-test/src/test/resources/log4j2-test.xml
+++ b/spring-test/src/test/resources/log4j2-test.xml
@@ -2,10 +2,10 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 		<File name="File" fileName="build/logs/spring-test.log">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</File>
 	</Appenders>
 	<Loggers>
diff --git a/spring-tx/src/test/resources/log4j2-test.xml b/spring-tx/src/test/resources/log4j2-test.xml
index 993ea541a1e..ff2f0402132 100644
--- a/spring-tx/src/test/resources/log4j2-test.xml
+++ b/spring-tx/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-web/src/test/resources/log4j2-test.xml b/spring-web/src/test/resources/log4j2-test.xml
index 8f4217bde4c..f37050e01ad 100644
--- a/spring-web/src/test/resources/log4j2-test.xml
+++ b/spring-web/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-webmvc/src/test/resources/log4j2-test.xml b/spring-webmvc/src/test/resources/log4j2-test.xml
index 89477e94bac..d2fd19eb58d 100644
--- a/spring-webmvc/src/test/resources/log4j2-test.xml
+++ b/spring-webmvc/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
diff --git a/spring-websocket/src/test/resources/log4j2-test.xml b/spring-websocket/src/test/resources/log4j2-test.xml
index d667a55cd1b..47d5e4b0de3 100644
--- a/spring-websocket/src/test/resources/log4j2-test.xml
+++ b/spring-websocket/src/test/resources/log4j2-test.xml
@@ -2,10 +2,10 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 		<File name="File" fileName="build/logs/spring-websocket.log">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</File>
 	</Appenders>
 	<Loggers>
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index df3661a24b1..d0ac5e7d6a2 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -2,7 +2,7 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>