diff --git a/spring-aop/src/test/resources/log4j2-test.xml b/spring-aop/src/test/resources/log4j2-test.xml
index 78b880bbcd..521cc44e65 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 f5e85a2eac..fb1c94a480 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 f5e85a2eac..fb1c94a480 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 ee1cd2ad04..9f3f3485f5 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 29784b2f51..e17ae99cd0 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 dfacd8a87e..37bbffbd70 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 a617bb543a..5c4984f0eb 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 4effcf32c9..d6de04caf4 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 331b1f344d..d23e1b2686 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 7ce30d928f..3cbacdb4ff 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 67aae9ce2e..0a2142f0d1 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 2479a3ff3a..35cd02a72e 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 81b17cc221..2d38f4e71c 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 bfcf311890..db28ecb3db 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 993ea541a1..ff2f040213 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 8f4217bde4..f37050e01a 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 89477e94ba..d2fd19eb58 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 d667a55cd1..47d5e4b0de 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 df3661a24b..d0ac5e7d6a 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>