Skip to content

Commit 38ab1ee

Browse files
marcphilippmarcphilipp
committed
Use XSD for Log4J config files
1 parent 0403116 commit 38ab1ee

File tree

6 files changed

+72
-52
lines changed

6 files changed

+72
-52
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎documentation/src/test/resources/log4j2-test.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="WARN">
2+
<Configuration status="WARN"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd">
36
<Appenders>
47
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
8+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
69
</Console>
710
</Appenders>
811
<Loggers>
9-
<Logger name="org.junit" level="warn" />
10-
<Logger name="example" level="warn" />
12+
<Logger name="org.junit" level="WARN"/>
13+
<Logger name="example" level="WARN"/>
1114
<!--
12-
<Logger name="example.callbacks" level="info" />
15+
<Logger name="example.callbacks" level="INFO"/>
1316
-->
14-
<Logger name="org.junit.vintage.engine.discovery" level="error" />
15-
<Root level="error">
16-
<AppenderRef ref="Console" />
17+
<Logger name="org.junit.vintage.engine.discovery" level="ERROR"/>
18+
<Root level="ERROR">
19+
<AppenderRef ref="Console"/>
1720
</Root>
1821
</Loggers>
19-
</Configuration>
22+
</Configuration>

‎junit-vintage-engine/src/test/resources/log4j2-test.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="WARN">
2+
<Configuration status="WARN"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd">
36
<Appenders>
47
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
8+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
69
</Console>
710
</Appenders>
811
<Loggers>
9-
<Logger name="org.junit" level="warn" />
10-
<Logger name="org.junit.vintage.engine" level="error" />
11-
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="off" />
12-
<Root level="error">
13-
<AppenderRef ref="Console" />
12+
<Logger name="org.junit" level="WARN"/>
13+
<Logger name="org.junit.vintage.engine" level="ERROR"/>
14+
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="OFF"/>
15+
<Root level="ERROR">
16+
<AppenderRef ref="Console"/>
1417
</Root>
1518
</Loggers>
16-
</Configuration>
19+
</Configuration>

‎jupiter-tests/src/test/resources/log4j2-test.xml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="WARN">
2+
<Configuration status="WARN"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd">
36
<Appenders>
47
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
8+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
69
</Console>
710
</Appenders>
811
<Loggers>
9-
<Logger name="org.junit" level="warn" />
10-
<Logger name="org.junit.jupiter.api" level="off" />
11-
<Logger name="org.junit.jupiter.engine" level="off" />
12-
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueNotifier" level="off" />
13-
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="off" />
14-
<Logger name="org.junit.jupiter.engine.extension.MutableExtensionRegistry" level="off" />
15-
<Logger name="org.junit.jupiter.engine.extension.TempDirectory$CloseablePath" level="off" />
16-
<Root level="error">
17-
<AppenderRef ref="Console" />
12+
<Logger name="org.junit" level="WARN"/>
13+
<Logger name="org.junit.jupiter.api" level="OFF"/>
14+
<Logger name="org.junit.jupiter.engine" level="OFF"/>
15+
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueNotifier" level="OFF"/>
16+
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="OFF"/>
17+
<Logger name="org.junit.jupiter.engine.extension.MutableExtensionRegistry" level="OFF"/>
18+
<Logger name="org.junit.jupiter.engine.extension.TempDirectory$CloseablePath" level="OFF"/>
19+
<Root level="ERROR">
20+
<AppenderRef ref="Console"/>
1821
</Root>
1922
</Loggers>
2023
</Configuration>

‎platform-tests/src/test/resources/log4j2-test.xml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="WARN">
2+
<Configuration status="WARN"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd">
36
<Appenders>
47
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
8+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
69
</Console>
710
</Appenders>
811
<Loggers>
9-
<Logger name="org.junit" level="warn" />
10-
<Logger name="org.junit.platform.commons.util.DefaultClasspathScanner" level="error" />
11-
<Logger name="org.junit.platform.engine.support.descriptor.DemoClassTestDescriptor" level="error" />
12-
<Logger name="org.junit.platform.launcher.core.CompositeEngineExecutionListener" level="error" />
13-
<Logger name="org.junit.platform.launcher.core.CompositeTestExecutionListener" level="error" />
14-
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueCollector" level="off" />
15-
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueNotifier" level="off" />
16-
<Logger name="org.junit.platform.launcher.core.EngineIdValidator" level="fatal" />
17-
<Logger name="org.junit.platform.launcher.core.EngineFilterer" level="error" />
18-
<Logger name="org.junit.platform.launcher.core.InternalTestPlan" level="error" />
19-
<Logger name="org.junit.platform.launcher.core.LauncherConfigurationParameters" level="error" />
20-
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="off" />
21-
<Logger name="org.junit.vintage.engine" level="error" />
22-
<Logger name="org.junit.jupiter.engine" level="error" />
23-
<Root level="error">
24-
<AppenderRef ref="Console" />
12+
<Logger name="org.junit" level="WARN"/>
13+
<Logger name="org.junit.platform.commons.util.DefaultClasspathScanner" level="ERROR"/>
14+
<Logger name="org.junit.platform.engine.support.descriptor.DemoClassTestDescriptor" level="ERROR"/>
15+
<Logger name="org.junit.platform.launcher.core.CompositeEngineExecutionListener" level="ERROR"/>
16+
<Logger name="org.junit.platform.launcher.core.CompositeTestExecutionListener" level="ERROR"/>
17+
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueCollector" level="OFF"/>
18+
<Logger name="org.junit.platform.launcher.core.DiscoveryIssueNotifier" level="OFF"/>
19+
<Logger name="org.junit.platform.launcher.core.EngineIdValidator" level="FATAL"/>
20+
<Logger name="org.junit.platform.launcher.core.EngineFilterer" level="ERROR"/>
21+
<Logger name="org.junit.platform.launcher.core.InternalTestPlan" level="ERROR"/>
22+
<Logger name="org.junit.platform.launcher.core.LauncherConfigurationParameters" level="ERROR"/>
23+
<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="OFF"/>
24+
<Logger name="org.junit.vintage.engine" level="ERROR"/>
25+
<Logger name="org.junit.jupiter.engine" level="ERROR"/>
26+
<Root level="ERROR">
27+
<AppenderRef ref="Console"/>
2528
</Root>
2629
</Loggers>
2730
</Configuration>

‎platform-tooling-support-tests/src/test/resources/log4j2-test.xml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="WARN">
2+
<Configuration status="WARN"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd">
36
<Appenders>
47
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
8+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
69
</Console>
710
</Appenders>
811
<Loggers>
9-
<Logger name="com.tngtech.archunit" level="warn" />
10-
<Logger name="org.junit" level="warn" />
11-
<Root level="error">
12-
<AppenderRef ref="Console" />
12+
<Logger name="com.tngtech.archunit" level="WARN"/>
13+
<Logger name="org.junit" level="WARN"/>
14+
<Root level="ERROR">
15+
<AppenderRef ref="Console"/>
1316
</Root>
1417
</Loggers>
1518
</Configuration>

0 commit comments

Comments
 (0)