This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/main/bump-junit in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f5b7fb6d7200e8fb4bf5342d2e9343c9ce9b11a1 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Oct 16 13:55:03 2024 +0200 Bump JUnit to version 5.11.2 This port #3069 to `main`. --- .../logging/log4j/core/test/junit/LoggingResolvers.java | 12 +++++++----- log4j-parent/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java index 534a2fef84..2cdba2352e 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggingResolvers.java @@ -48,11 +48,13 @@ import org.junit.platform.commons.support.ReflectionSupport; @Inherited @Documented @Log4jTest -@ExtendWith(LoggerContextResolver.class) -@ExtendWith(ConfigurationResolver.class) -@ExtendWith(AppenderResolver.class) -@ExtendWith(AppenderManagerResolver.class) -@ExtendWith(LoggerResolver.class) +@ExtendWith({ + LoggerContextResolver.class, + ConfigurationResolver.class, + AppenderResolver.class, + AppenderManagerResolver.class, + LoggerResolver.class +}) public @interface LoggingResolvers {} /** diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index b5d1111f45..ef1a2234ec 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -121,7 +121,7 @@ <json-unit.version>3.4.1</json-unit.version> <jspecify.version>1.0.0</jspecify.version> <junit.version>4.13.2</junit.version> - <junit-jupiter.version>5.10.3</junit-jupiter.version> + <junit-jupiter.version>5.11.2</junit-jupiter.version> <junit-pioneer.version>2.2.0</junit-pioneer.version> <log4j.version>1.2.17</log4j.version> <log4j2-custom-layout.version>1.1.0</log4j2-custom-layout.version> diff --git a/pom.xml b/pom.xml index fc17834fba..c246339285 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ <project.build.outputTimestamp>2024-02-17T17:58:36Z</project.build.outputTimestamp> <!-- Version of Log4j API required --> - <log4j-api.version>2.24.1</log4j-api.version> + <log4j-api.version>2.25.0-SNAPSHOT</log4j-api.version> <!-- ======================== Site-specific properties
