From 7a3d500e06639e9ecca43400d5d44184fcc6f751 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 28 Mar 2022 12:54:59 -0400
Subject: [PATCH] Updated CoreLibs to log4j v 2.17.2
---
CoreLibs/ivy.xml | 8 ++++----
CoreLibs/nbproject/project.properties | 2 +-
CoreLibs/nbproject/project.xml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 772fe0b4db..cec7485556 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -29,10 +29,10 @@
<dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.6"/>
<dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.2"/>
<dependency conf="autopsy_core->*" org="commons-io" name="commons-io" rev="2.5"/>
- <!-- Prevent log4j 2.17.1 from bringing in its many optional dependencies -->
- <dependency conf="autopsy_core->*" org="org.osgi" name="osgi.core" rev="8.0.0"/>
- <dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1" transitive="false"/>
- <dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.1" transitive="false"/>
+ <!-- Prevent log4j 2.17.2 from bringing in its many optional dependencies -->
+ <dependency conf="autopsy_core->*" org="org.osgi" name="osgi.core" rev="8.0.0"/>
+ <dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-api" rev="2.17.2" transitive="false"/>
+ <dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.2" transitive="false"/>
<!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
<dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>
<dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index d4e86a4984..2e83c2371e 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -44,7 +44,7 @@ file.reference.jna-platform-5.11.0.jar=release/modules/ext/jna-platform-5.11.0.j
file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
-file.reference.log4j-core-2.17.1.jar=release/modules/ext/log4j-core-2.17.1.jar
+file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar
file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar
file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index ad1f6cf91d..17249980ee 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -875,8 +875,8 @@
<binary-origin>release/modules/ext/imageio-pcx-3.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/log4j-core-2.17.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/log4j-core-2.17.1.jar</binary-origin>
+ <runtime-relative-path>ext/log4j-core-2.17.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/log4j-core-2.17.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path>
--
GitLab