Harmonize logging test configuration

spring-io · Aug 18, 2019 · 976f290 · 976f290
1 parent cd59699
commit 976f290
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 6 deletions.
diff --git a/initializr-actuator/src/test/resources/logback-test.xml b/initializr-actuator/src/test/resources/logback-test.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<root level="warn">
+		<appender-ref ref="CONSOLE" />
+	</root>
+</configuration>
diff --git a/initializr-generator-spring/pom.xml b/initializr-generator-spring/pom.xml
@@ -61,6 +61,11 @@
 			<artifactId>mockito-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/initializr-generator-spring/src/test/resources/logback-test.xml b/initializr-generator-spring/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{1.} : %m%n"/>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+	<root level="warn">
+		<appender-ref ref="CONSOLE"/>
+	</root>
+</configuration>
diff --git a/initializr-generator/pom.xml b/initializr-generator/pom.xml
@@ -42,6 +42,11 @@
 			<artifactId>mockito-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/initializr-generator/src/test/resources/logback-test.xml b/initializr-generator/src/test/resources/logback-test.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{1.} : %m%n"/>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
 	<root level="warn">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
-</configuration>
+</configuration>
diff --git a/initializr-metadata/pom.xml b/initializr-metadata/pom.xml
@@ -56,6 +56,11 @@
 			<artifactId>snakeyaml</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/initializr-metadata/src/test/resources/logback-test.xml b/initializr-metadata/src/test/resources/logback-test.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{1.} : %m%n"/>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
 	<root level="warn">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="CONSOLE"/>
 	</root>
-</configuration>
+</configuration>
diff --git a/initializr-version-resolver/pom.xml b/initializr-version-resolver/pom.xml
@@ -39,6 +39,11 @@
 			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/initializr-version-resolver/src/test/resources/logback-test.xml b/initializr-version-resolver/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{1.} : %m%n"/>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+	<root level="warn">
+		<appender-ref ref="CONSOLE"/>
+	</root>
+</configuration>
diff --git a/initializr-web/src/test/resources/logback-test.xml b/initializr-web/src/test/resources/logback-test.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<root level="warn">
+		<appender-ref ref="CONSOLE" />
+	</root>
+</configuration>