From e8f8556df39322812bcdecccf4d1af6e6c0217da Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 25 Jan 2017 14:08:02 +0000
Subject: [PATCH] Remove remapping of Thymeleaf's logging as it is no longer
 necessary

Thymeleaf 3.0 no longer logs its initialization information at INFO
level so we no longer need to remap its INFO output to DEBUG.

Closes gh-7657
---
 .../boot/logging/logback/DefaultLogbackConfiguration.java      | 3 +--
 .../org/springframework/boot/logging/log4j2/log4j2-file.xml    | 1 -
 .../org/springframework/boot/logging/log4j2/log4j2.xml         | 1 -
 .../org/springframework/boot/logging/logback/defaults.xml      | 3 ---
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
index 55e6c7b259b..7c6036c6f2c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,7 +108,6 @@ class DefaultLogbackConfiguration {
 		config.logger("org.hibernate.validator.internal.util.Version", Level.WARN);
 		config.logger("org.springframework.boot.actuate.endpoint.jmx", null, false,
 				debugRemapAppender);
-		config.logger("org.thymeleaf", null, false, debugRemapAppender);
 	}
 
 	private Appender<ILoggingEvent> consoleAppender(LogbackConfigurator config) {
diff --git a/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
index 844c9d05dd1..fe763e64682 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
@@ -29,7 +29,6 @@
 		<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"/>
-		<logger name="org.thymeleaf" level="warn"/>
 		<Root level="info">
 			<AppenderRef ref="Console" />
 			<AppenderRef ref="File" />
diff --git a/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
index 1360c352c59..fe673cd7954 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
@@ -21,7 +21,6 @@
 		<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"/>
-		<logger name="org.thymeleaf" level="warn"/>
 		<Root level="info">
 			<AppenderRef ref="Console" />
 		</Root>
diff --git a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
index 348c6d2ffef..4d3adef6100 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
@@ -26,7 +26,4 @@ initialization performed by Boot
 	<logger name="org.springframework.boot.actuate.endpoint.jmx" additivity="false">
 		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
 	</logger>
-	<logger name="org.thymeleaf" additivity="false">
-		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
-	</logger>
 </included>