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 b0347161d07bc4a9aba3e30a441ff1d193ce9b47 Author: Matt Sicker <[email protected]> AuthorDate: Sun Aug 2 17:07:59 2020 -0500 [LOG4J2-2653] Simplify JUnit dependencies --- log4j-1.2-api/pom.xml | 9 --------- log4j-api/pom.xml | 6 +----- log4j-appserver/pom.xml | 8 -------- log4j-cassandra/pom.xml | 8 -------- log4j-core-its/pom.xml | 8 -------- log4j-core/pom.xml | 8 -------- log4j-couchdb/pom.xml | 8 -------- log4j-flume-ng/pom.xml | 8 -------- log4j-iostreams/pom.xml | 8 -------- log4j-jcl/pom.xml | 8 -------- log4j-jdbc-dbcp2/pom.xml | 8 -------- log4j-jpa/pom.xml | 8 -------- log4j-jpl/pom.xml | 8 -------- log4j-kubernetes/pom.xml | 8 -------- log4j-layout-json-template/pom.xml | 8 -------- log4j-liquibase/pom.xml | 8 -------- log4j-mongodb3/pom.xml | 8 -------- log4j-mongodb4/pom.xml | 8 -------- log4j-osgi/pom.xml | 8 -------- log4j-slf4j-impl/pom.xml | 8 -------- log4j-slf4j18-impl/pom.xml | 8 -------- log4j-spring-boot/pom.xml | 13 ------------- .../log4j-spring-cloud-config-client/pom.xml | 8 -------- log4j-taglib/pom.xml | 8 -------- log4j-to-slf4j/pom.xml | 8 -------- log4j-web/pom.xml | 8 -------- pom.xml | 8 ++++---- 27 files changed, 5 insertions(+), 215 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index 8a82c32..4089266 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -35,20 +35,11 @@ </properties> <dependencies> <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> <!-- Place Felix before Equinox because Felix is signed. --> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index e587155..26c0a0a 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -51,16 +51,12 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> + <artifactId>junit-jupiter-migrationsupport</artifactId> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index 6d1be2d..641699b 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -88,19 +88,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml index 138318f..a8eec60 100644 --- a/log4j-cassandra/pom.xml +++ b/log4j-cassandra/pom.xml @@ -47,19 +47,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index dd1364b..30af9f7 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -125,19 +125,11 @@ </dependency> <!-- JUnit, naturally --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index 960e08e..8b4ba48 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -188,19 +188,11 @@ </dependency> <!-- JUnit, naturally --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml index 601833b..68891cc 100644 --- a/log4j-couchdb/pom.xml +++ b/log4j-couchdb/pom.xml @@ -47,19 +47,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml index 86981bc..14d2595 100644 --- a/log4j-flume-ng/pom.xml +++ b/log4j-flume-ng/pom.xml @@ -68,19 +68,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml index 5a9e760..f067ec3 100644 --- a/log4j-iostreams/pom.xml +++ b/log4j-iostreams/pom.xml @@ -54,19 +54,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml index 3867199..62214a1 100644 --- a/log4j-jcl/pom.xml +++ b/log4j-jcl/pom.xml @@ -35,19 +35,11 @@ </properties> <dependencies> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml index edbc833..3ac0014 100644 --- a/log4j-jdbc-dbcp2/pom.xml +++ b/log4j-jdbc-dbcp2/pom.xml @@ -39,19 +39,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml index 552c777..208cbf1 100644 --- a/log4j-jpa/pom.xml +++ b/log4j-jpa/pom.xml @@ -48,19 +48,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml index 0a66699..9c98807 100644 --- a/log4j-jpl/pom.xml +++ b/log4j-jpl/pom.xml @@ -56,19 +56,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> </dependencies> diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml index cab9537..e307e95 100644 --- a/log4j-kubernetes/pom.xml +++ b/log4j-kubernetes/pom.xml @@ -50,19 +50,11 @@ <artifactId>kubernetes-client</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <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> </dependencies> diff --git a/log4j-layout-json-template/pom.xml b/log4j-layout-json-template/pom.xml index 741bcf1..5dbc8c2 100644 --- a/log4j-layout-json-template/pom.xml +++ b/log4j-layout-json-template/pom.xml @@ -62,19 +62,11 @@ </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml index 484226e..b0a75fa 100644 --- a/log4j-liquibase/pom.xml +++ b/log4j-liquibase/pom.xml @@ -64,19 +64,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> </dependencies> diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml index bd28ca8..81048f8 100644 --- a/log4j-mongodb3/pom.xml +++ b/log4j-mongodb3/pom.xml @@ -53,19 +53,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml index 75d48e6..2442af0 100644 --- a/log4j-mongodb4/pom.xml +++ b/log4j-mongodb4/pom.xml @@ -53,19 +53,11 @@ </dependency> <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index 25881a2..35d50fe 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -46,19 +46,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index 71cc5b5..df66104 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -84,19 +84,11 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <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> </dependencies> diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml index dc37a3d..1158f3b 100644 --- a/log4j-slf4j18-impl/pom.xml +++ b/log4j-slf4j18-impl/pom.xml @@ -84,19 +84,11 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <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> </dependencies> diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml index 13f3348..23f06fc 100644 --- a/log4j-spring-boot/pom.xml +++ b/log4j-spring-boot/pom.xml @@ -53,24 +53,11 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <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> 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 7566bf8..d82626f 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 @@ -35,19 +35,11 @@ </properties> <dependencies> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index 0d2c45f..4abdd44 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -67,19 +67,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index b36c02a..c8f6528 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -59,19 +59,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml index 88b775c..aedceba 100644 --- a/log4j-web/pom.xml +++ b/log4j-web/pom.xml @@ -60,19 +60,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <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> diff --git a/pom.xml b/pom.xml index fd44d0d..603b2a2 100644 --- a/pom.xml +++ b/pom.xml @@ -667,17 +667,17 @@ <artifactId>jctools-core</artifactId> <version>${jctoolsVersion}</version> </dependency> - <!-- JUnit 5 API dependency --> + <!-- JUnit 5 engine --> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> + <artifactId>junit-jupiter-engine</artifactId> <version>5.6.2</version> <scope>test</scope> </dependency> - <!-- JUnit 5 engine --> + <!-- JUnit 4 to 5 migration support --> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> + <artifactId>junit-jupiter-migrationsupport</artifactId> <version>5.6.2</version> <scope>test</scope> </dependency>
