This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b3e35673cfcbbca64df000d3fb43ff2fa5037273 Author: Matt Sicker <[email protected]> AuthorDate: Sun Aug 2 15:01:34 2020 -0500 [LOG4J2-2653] Add initial JUnit 5 support This adds JUnit 5 support to most of the modules. Unchanged modules either contain no tests or use JUnit 4 specific features that need some adjustments to run in the JUnit vintage engine. Backported from 3.x which includes several pom.xml modernizations as well. --- log4j-1.2-api/pom.xml | 12 ++++++ log4j-api/pom.xml | 13 ++++++- log4j-appserver/pom.xml | 13 ++++++- log4j-cassandra/pom.xml | 12 ++++++ log4j-core-its/pom.xml | 13 ++++++- log4j-core/pom.xml | 13 ++++++- .../log4j/test/appender/EncodingListAppender.java | 6 ++- log4j-couchdb/pom.xml | 12 ++++++ log4j-flume-ng/pom.xml | 13 ++++++- log4j-iostreams/pom.xml | 13 ++++++- log4j-jcl/pom.xml | 13 ++++++- log4j-jdbc-dbcp2/pom.xml | 12 ++++++ log4j-jpa/pom.xml | 12 ++++++ log4j-jpl/pom.xml | 13 ++++++- log4j-jul/pom.xml | 1 - log4j-kubernetes/pom.xml | 13 ++++++- log4j-layout-json-template/pom.xml | 13 ++++++- log4j-liquibase/pom.xml | 13 ++++++- log4j-mongodb3/pom.xml | 12 ++++++ log4j-mongodb4/pom.xml | 12 ++++++ log4j-osgi/pom.xml | 13 ++++++- log4j-slf4j-impl/pom.xml | 13 ++++++- log4j-slf4j18-impl/pom.xml | 13 ++++++- log4j-spring-boot/pom.xml | 17 +++++++++ .../log4j-spring-cloud-config-client/pom.xml | 13 ++++++- log4j-taglib/pom.xml | 13 ++++++- log4j-to-slf4j/pom.xml | 13 ++++++- log4j-web/pom.xml | 13 ++++++- pom.xml | 43 ++++++++++++++++------ 29 files changed, 353 insertions(+), 32 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index eef9383..8a82c32 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -39,6 +39,18 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> <!-- Place Felix before Equinox because Felix is signed. --> <dependency> <groupId>org.apache.felix</groupId> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index c90000e..e587155 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -53,7 +53,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.eclipse.tycho</groupId> diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index 1822c85..6d1be2d 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -90,7 +90,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml index 28cb046..138318f 100644 --- a/log4j-cassandra/pom.xml +++ b/log4j-cassandra/pom.xml @@ -51,6 +51,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 294fc5f..dd1364b 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -127,7 +127,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index 95a301c..960e08e 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -190,7 +190,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java index 4d7ee56..680645a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java @@ -41,8 +41,10 @@ public class EncodingListAppender extends ListAppender { super(name, filter, layout, newline, raw); } - private class Destination implements ByteBufferDestination { - ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[4096]); + private static class Destination implements ByteBufferDestination { + // JUnit 5 stack traces can start to get looooong + ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[8192]); + @Override public ByteBuffer getByteBuffer() { return byteBuffer; diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml index 40240e2..601833b 100644 --- a/log4j-couchdb/pom.xml +++ b/log4j-couchdb/pom.xml @@ -51,6 +51,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml index 9c108e0..86981bc 100644 --- a/log4j-flume-ng/pom.xml +++ b/log4j-flume-ng/pom.xml @@ -70,7 +70,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.apache.flume</groupId> diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml index 25abb7e..5a9e760 100644 --- a/log4j-iostreams/pom.xml +++ b/log4j-iostreams/pom.xml @@ -56,7 +56,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml index eeb6b63..3867199 100644 --- a/log4j-jcl/pom.xml +++ b/log4j-jcl/pom.xml @@ -37,7 +37,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml index 4144e0c..edbc833 100644 --- a/log4j-jdbc-dbcp2/pom.xml +++ b/log4j-jdbc-dbcp2/pom.xml @@ -43,6 +43,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <type>test-jar</type> diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml index 8d557d4..552c777 100644 --- a/log4j-jpa/pom.xml +++ b/log4j-jpa/pom.xml @@ -52,6 +52,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <type>test-jar</type> diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml index ca45baf..0a66699 100644 --- a/log4j-jpl/pom.xml +++ b/log4j-jpl/pom.xml @@ -58,7 +58,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> </dependencies> diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml index 11d1c5c..48552a5 100644 --- a/log4j-jul/pom.xml +++ b/log4j-jul/pom.xml @@ -58,7 +58,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> <!-- Required for AsyncLogger testing --> <dependency> diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml index 1326d45..cab9537 100644 --- a/log4j-kubernetes/pom.xml +++ b/log4j-kubernetes/pom.xml @@ -52,7 +52,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> </dependencies> <build> diff --git a/log4j-layout-json-template/pom.xml b/log4j-layout-json-template/pom.xml index e060b94..741bcf1 100644 --- a/log4j-layout-json-template/pom.xml +++ b/log4j-layout-json-template/pom.xml @@ -64,7 +64,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml index 902be33..484226e 100644 --- a/log4j-liquibase/pom.xml +++ b/log4j-liquibase/pom.xml @@ -66,7 +66,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> </dependencies> <build> diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml index f456c66..bd28ca8 100644 --- a/log4j-mongodb3/pom.xml +++ b/log4j-mongodb3/pom.xml @@ -57,6 +57,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml index c4603fd..75d48e6 100644 --- a/log4j-mongodb4/pom.xml +++ b/log4j-mongodb4/pom.xml @@ -57,6 +57,18 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index 727c8cc..25881a2 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -48,7 +48,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.eclipse.tycho</groupId> diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index 9d22ca5..71cc5b5 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -86,7 +86,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> </dependencies> <build> diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml index 278b0bb..dc37a3d 100644 --- a/log4j-slf4j18-impl/pom.xml +++ b/log4j-slf4j18-impl/pom.xml @@ -86,7 +86,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> </dependencies> <build> diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml index 8dd6116..13f3348 100644 --- a/log4j-spring-boot/pom.xml +++ b/log4j-spring-boot/pom.xml @@ -62,6 +62,23 @@ <artifactId>spring-boot</artifactId> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <type>test-jar</type> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml index ae200dd..7566bf8 100644 --- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml +++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml @@ -37,7 +37,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index 221327b..0d2c45f 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -69,7 +69,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 2f8ce47..b36c02a 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -61,7 +61,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml index 44afcbe..88b775c 100644 --- a/log4j-web/pom.xml +++ b/log4j-web/pom.xml @@ -62,7 +62,18 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/pom.xml b/pom.xml index bea0372..fd44d0d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,13 +22,11 @@ <name>Apache Log4j 2</name> <version>2.14.0-SNAPSHOT</version> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>21</version> + <groupId>org.apache.logging</groupId> + <artifactId>logging-parent</artifactId> + <version>2</version> + <relativePath/> </parent> - <prerequisites> - <maven>3.0.5</maven> - </prerequisites> <description>Apache Log4j 2</description> <url>https://logging.apache.org/log4j/2.x/</url> <issueManagement> @@ -37,7 +35,7 @@ </issueManagement> <ciManagement> <system>Jenkins</system> - <url>https://builds.apache.org/job/Log4j%202.x/</url> + <url>https://ci-builds.apache.org/job/Logging/job/log4j/</url> </ciManagement> <inceptionYear>1999</inceptionYear> <developers> @@ -173,9 +171,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary</url> + <connection>scm:git:https://gitbox.apache.org/repos/asf/logging-log4j2.git</connection> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/logging-log4j2.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=logging-log4j2.git</url> <tag>log4j-${Log4jReleaseVersion}</tag> </scm> <properties> @@ -231,6 +229,7 @@ <manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <docLabel>Site Documentation</docLabel> <projectDir /> <commonsLoggingVersion>1.2</commonsLoggingVersion> @@ -668,12 +667,34 @@ <artifactId>jctools-core</artifactId> <version>${jctoolsVersion}</version> </dependency> + <!-- JUnit 5 API dependency --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>5.6.2</version> + <scope>test</scope> + </dependency> + <!-- JUnit 5 engine --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>5.6.2</version> + <scope>test</scope> + </dependency> + <!-- JUnit 4 API dependency --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.13</version> <scope>test</scope> </dependency> + <!-- JUnit 4 engine --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>5.6.2</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> @@ -695,7 +716,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> <scope>test</scope> </dependency> <dependency>
