This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 4884ac45a3 Move SLF4J dependencies to SLF4J-related modules
4884ac45a3 is described below
commit 4884ac45a37ba08e0d8679811d8ce94bd5b18089
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Sat Mar 30 23:12:09 2024 +0100
Move SLF4J dependencies to SLF4J-related modules
---
log4j-core-its/pom.xml | 6 ------
log4j-core-test/pom.xml | 5 -----
log4j-core/pom.xml | 7 -------
log4j-mongodb3/pom.xml | 5 -----
log4j-mongodb4/pom.xml | 5 -----
log4j-parent/pom.xml | 7 -------
log4j-perf-test/pom.xml | 12 ++++++++++++
log4j-slf4j-impl/pom.xml | 7 +++----
log4j-slf4j2-impl/pom.xml | 14 ++++++++++++++
log4j-to-slf4j/pom.xml | 13 +++++++++++++
10 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 8564c7c0fc..3163e3248e 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -153,12 +153,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <!-- SLF4J tests -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index ac718f0e72..f005dc8a95 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -317,11 +317,6 @@
<artifactId>plexus-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Used for testing HttpAppender -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 0f9429a41e..c5832adac4 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -201,13 +201,6 @@
<scope>runtime</scope>
<optional>true</optional>
</dependency>
- <!-- Kafka needs slf4j -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index 010879ed58..6efde08146 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -161,11 +161,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</plugin>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index ad7395f117..f8b055f799 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -153,11 +153,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</plugin>
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 774e3f92b1..816bcf4184 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -135,7 +135,6 @@
<osgi.api.version>6.0.0</osgi.api.version>
<pax-exam.version>4.13.5</pax-exam.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
- <slf4j.version>2.0.9</slf4j.version>
<spring-boot.version>2.7.18</spring-boot.version>
<spring-framework.version>5.3.33</spring-framework.version>
<system-stubs.version>2.0.3</system-stubs.version>
@@ -909,12 +908,6 @@
<version>${plexus-utils.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
diff --git a/log4j-perf-test/pom.xml b/log4j-perf-test/pom.xml
index 500a36bc15..01e1d88397 100644
--- a/log4j-perf-test/pom.xml
+++ b/log4j-perf-test/pom.xml
@@ -41,8 +41,20 @@
<maven.compiler.release>9</maven.compiler.release>
<surefire.jdkToolchain>[9, )</surefire.jdkToolchain>
<spotbugs.skip>true</spotbugs.skip>
+
+ <slf4j2.version>2.0.9</slf4j2.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j2.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.openjdk.jmh</groupId>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 6eb6f93585..0cc3b4d773 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -27,18 +27,17 @@
<packaging>jar</packaging>
<name>Apache Log4j SLF4J Binding</name>
<description>The Apache Log4j SLF4J API binding to Log4j 2 Core</description>
+
<properties>
- <slf4j.version>1.7.36</slf4j.version>
+ <slf4j1.version>1.7.36</slf4j1.version>
</properties>
- <!-- Use explicit versions as a temporary workaround to a Coursier/Ivy bug:
- https://github.com/apache/logging-log4j2/issues/2065 -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <version>${slf4j1.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 4bb3954206..279ee47b15 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -29,6 +29,20 @@
<name>Apache Log4j SLF4J 2.0 Binding</name>
<description>The Apache Log4j SLF4J 2.0 API binding to Log4j 2
Core</description>
+ <properties>
+ <slf4j2.version>2.0.9</slf4j2.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j2.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index d5d1c4e172..6b3840e24d 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -37,7 +37,20 @@
<!-- This bridge also support SLF4J 2.x -->
org.slf4j.*;version="${slf4j.support.range}"
</bnd-extra-package-options>
+
+ <slf4j2.version>2.0.9</slf4j2.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j2.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
