You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/07/14 12:29:00 UTC

[commons-configuration] branch master updated: [CONFIGURATION-815] Replace optional Apache Log4j 1.2.17 with 2.18.0.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git


The following commit(s) were added to refs/heads/master by this push:
     new a32f5140 [CONFIGURATION-815] Replace optional Apache Log4j 1.2.17 with 2.18.0.
a32f5140 is described below

commit a32f514073e09f9bcd1f11c6cd0dd46ea244efe8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 14 08:28:53 2022 -0400

    [CONFIGURATION-815] Replace optional Apache Log4j 1.2.17 with 2.18.0.
---
 pom.xml                 | 13 ++++++++++---
 src/changes/changes.xml |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd020f7a..cd296d72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -521,9 +521,15 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+      <version>${log4j.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -586,6 +592,7 @@
       org.yaml.snakeyaml.*;resolution:=optional,
       *
     </commons.osgi.import>
+    <log4j.version>2.18.0</log4j.version>
     <slf4j.version>1.7.36</slf4j.version>
     <spring.version>5.3.21</spring.version>
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 764ced9f..43368a3d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,6 +22,12 @@
   </properties>
   <body>
     <release version="2.9.0" date="TBD" description="Minor release with new features and updated dependencies.">
+      <!-- FIX -->
+      <action issue="CONFIGURATION-815" type="fix" dev="ggregory" due-to="Gary Gregory">
+        Replace optional Apache Log4j 1.2.17 with 2.18.0.
+      </action>
+      <!-- ADD -->
+      <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">
         Bump spotbugs-maven-plugin from 4.7.0.0 to 4.7.1.0 #193.
       </action>