Skip to content

Upgrades JUnit to version 5.11.2 #3069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Upgrades JUnit to version 5.11.2 #3069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SetTestProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
@Target({TYPE, METHOD})
@Inherited
@Documented
@ExtendWith(ExtensionContextAnchor.class)
@ExtendWith(TestPropertyResolver.class)
@ExtendWith({ExtensionContextAnchor.class, TestPropertyResolver.class})
@Repeatable(SetTestProperty.SetTestProperties.class)
@ReadsSystemProperty
@ReadsEnvironmentVariable
Expand All @@ -54,7 +53,7 @@
@Target({TYPE, METHOD})
@Documented
@Inherited
public @interface SetTestProperties {
@interface SetTestProperties {

SetTestProperty[] value();
}
Expand Down
3 changes: 1 addition & 2 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TempLoggingDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
@Target({FIELD, PARAMETER})
@Inherited
@Documented
@ExtendWith(ExtensionContextAnchor.class)
@ExtendWith(TempLoggingDirectory.class)
@ExtendWith({ExtensionContextAnchor.class, TempLoggingDirectory.class})
public @interface TempLoggingDir {

CleanupMode cleanup() default CleanupMode.DEFAULT;
Expand Down
4 changes: 1 addition & 3 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingStatusListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@
@Retention(RUNTIME)
@Target({TYPE, METHOD})
@Documented
@ExtendWith(ExtensionContextAnchor.class)
@ExtendWith(TestPropertyResolver.class)
@ExtendWith(StatusListenerExtension.class)
@ExtendWith({ExtensionContextAnchor.class, TestPropertyResolver.class, StatusListenerExtension.class})
public @interface UsingStatusListener {}
3 changes: 1 addition & 2 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/UsingTestProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
@Target({TYPE, METHOD})
@Inherited
@Documented
@ExtendWith(ExtensionContextAnchor.class)
@ExtendWith(TestPropertyResolver.class)
@ExtendWith({ExtensionContextAnchor.class, TestPropertyResolver.class})
@ReadsSystemProperty
@ReadsEnvironmentVariable
public @interface UsingTestProperties {}
4 changes: 1 addition & 3 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
* limitations under the license.
*/
@Export
@Version("2.24.0")
@BaselineIgnore("2.24.0")
@Version("2.24.1")
package org.apache.logging.log4j.test.junit;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import org.osgi.annotation.bundle.Export;
import org.osgi.annotation.versioning.Version;
10 changes: 6 additions & 4 deletions ...core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@
@Documented
@Inherited
@Tag("functional")
@ExtendWith(TempLoggingDirectory.class)
@ExtendWith(LoggerContextResolver.class)
@ExtendWith(ConfigurationResolver.class)
@ExtendWith(AppenderResolver.class)
@ExtendWith({
TempLoggingDirectory.class,
LoggerContextResolver.class,
ConfigurationResolver.class,
AppenderResolver.class
})
public @interface LoggerContextSource {
/**
* Specifies the name of the configuration file to use for the annotated test.
Expand Down
2 changes: 1 addition & 1 deletion log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* @see org.junit.rules.TestRule
*/
@Export
@Version("2.23.0")
@Version("2.23.1")
package org.apache.logging.log4j.core.test.junit;

import org.osgi.annotation.bundle.Export;
Expand Down
2 changes: 1 addition & 1 deletion log4j-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<jmdns.version>3.5.12</jmdns.version>
<jmh.version>1.37</jmh.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>1.9.1</junit-pioneer.version>
<kafka.version>3.8.0</kafka.version>
<lightcouch.version>0.2.0</lightcouch.version>
Expand Down