This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new 9b6c93e361 KARAF-7815: Upgrade to Pax Logging 2.2.7/slf4j 2.0.12/log4j
2.23.1
9b6c93e361 is described below
commit 9b6c93e3613714dcb57f829e02e2b9e3a8c2a918
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Thu Mar 28 15:42:20 2024 +0100
KARAF-7815: Upgrade to Pax Logging 2.2.7/slf4j 2.0.12/log4j 2.23.1
(cherry picked from commit 03354d2635441d19ff762e217348f798a19cc983)
---
bom/pom.xml | 9 +++++++--
jaas/modules/pom.xml | 4 ++--
pom.xml | 6 +++---
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 248a208472..07919b460b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -957,8 +957,13 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index fefd69a8d4..4a0b2f3d2a 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -103,8 +103,8 @@
<!-- Test dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 105cdbf71e..a4a6753748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,7 @@
<jline.version>3.21.0</jline.version>
<junit.version>4.13.2</junit.version>
<jsw.version>3.2.3</jsw.version>
- <log4j.version>1.2.17</log4j.version>
+ <log4j.version>2.23.1</log4j.version>
<maven.version>3.8.6</maven.version>
<maven.wagon.version>3.5.2</maven.wagon.version>
<maven-plugin-annotations.version>3.10.2</maven-plugin-annotations.version>
@@ -308,7 +308,7 @@
<pax.cdi.version>1.1.4</pax.cdi.version>
<pax.exam.version>4.13.5</pax.exam.version>
- <pax.logging.version>2.2.6</pax.logging.version>
+ <pax.logging.version>2.2.7</pax.logging.version>
<pax.base.version>1.5.1</pax.base.version>
<pax.swissbox.version>1.8.5</pax.swissbox.version>
<pax.url.version>2.6.14</pax.url.version>
@@ -320,7 +320,7 @@
<portlet-api.version>2.0</portlet-api.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
- <slf4j.version>1.7.32</slf4j.version>
+ <slf4j.version>2.0.12</slf4j.version>
<spec.activation.version>1.2.2</spec.activation.version>
<spec.annotation.version>1.3.5</spec.annotation.version>
