Skip to content

Commit f5b7fb6

Browse files
committed
Bump JUnit to version 5.11.2
This port #3069 to `main`.
1 parent 0e632f0 commit f5b7fb6

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
@Inherited
4949
@Documented
5050
@Log4jTest
51-
@ExtendWith(LoggerContextResolver.class)
52-
@ExtendWith(ConfigurationResolver.class)
53-
@ExtendWith(AppenderResolver.class)
54-
@ExtendWith(AppenderManagerResolver.class)
55-
@ExtendWith(LoggerResolver.class)
51+
@ExtendWith({
52+
LoggerContextResolver.class,
53+
ConfigurationResolver.class,
54+
AppenderResolver.class,
55+
AppenderManagerResolver.class,
56+
LoggerResolver.class
57+
})
5658
public @interface LoggingResolvers {}
5759

5860
/**

log4j-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<json-unit.version>3.4.1</json-unit.version>
122122
<jspecify.version>1.0.0</jspecify.version>
123123
<junit.version>4.13.2</junit.version>
124-
<junit-jupiter.version>5.10.3</junit-jupiter.version>
124+
<junit-jupiter.version>5.11.2</junit-jupiter.version>
125125
<junit-pioneer.version>2.2.0</junit-pioneer.version>
126126
<log4j.version>1.2.17</log4j.version>
127127
<log4j2-custom-layout.version>1.1.0</log4j2-custom-layout.version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
<project.build.outputTimestamp>2024-02-17T17:58:36Z</project.build.outputTimestamp>
326326

327327
<!-- Version of Log4j API required -->
328-
<log4j-api.version>2.24.1</log4j-api.version>
328+
<log4j-api.version>2.25.0-SNAPSHOT</log4j-api.version>
329329

330330
<!-- ========================
331331
Site-specific properties

0 commit comments

Comments
 (0)