This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new fb57f4e18c Remove unused test dependencies
fb57f4e18c is described below
commit fb57f4e18c8826b36caf3a1a1378fc359fbf2a44
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Thu Sep 22 22:04:00 2022 +0200
Remove unused test dependencies
This removes test-scoped dependencies from test-less modules.
It also removes unused provided or compile dependencies (according to
`dependency:analyze) or moves them to the runtime scope.
Some undeclared compile dependencies are added.
---
log4j-api/pom.xml | 52 --------------------------------------
log4j-core/pom.xml | 14 +---------
log4j-layout-template-json/pom.xml | 8 ++++++
log4j-plugins/pom.xml | 30 +---------------------
4 files changed, 10 insertions(+), 94 deletions(-)
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 2669d7f776..ded0a0bdb6 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -38,58 +38,6 @@
<artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.resource</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Required for JSON support -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Required for JSON support -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 56341ff53e..5299037319 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -49,11 +49,6 @@
<artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.resource</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Required for AsyncLoggers -->
<dependency>
<groupId>com.lmax</groupId>
@@ -94,14 +89,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- POM for jackson-dataformat-xml 2.9.2 depends on woodstox-core 5.0.3
-->
- <dependency>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
- <optional>true</optional>
+ <scope>runtime</scope>
</dependency>
<!-- Required for console color support in Windows -->
<dependency>
diff --git a/log4j-layout-template-json/pom.xml
b/log4j-layout-template-json/pom.xml
index 8674c58705..3ee9f59dff 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -42,10 +42,18 @@
<dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-plugins</artifactId>
+ </dependency>
<dependency>
<groupId>org.jctools</groupId>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 477a40084b..419ec613ec 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -43,36 +43,8 @@
<artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.resource</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- TEST DEPENDENCIES -->
-
- <!-- Pull in useful test classes from API -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
