From f28653491da9984cf63f4849b4a3c9e3018020c1 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Wed, 12 Jan 2022 10:31:13 -0500
Subject: [PATCH] Fix ivy path. Add log4j dependencies.
---
Core/build.xml | 2 +-
CoreLibs/build.xml | 2 +-
CoreLibs/ivy.xml | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Core/build.xml b/Core/build.xml
index 5cb0c3811a..1e8f4370e6 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -203,7 +203,7 @@
<copy file="${thirdparty.dir}/LICENSE-2.0.txt" todir="${ext.dir}" />
<!-- fetch all the dependencies from Ivy and stick them in the right places -->
<ivy:resolve log="quiet"/>
- <ivy:report todir='${basedir}/ivy-reports' graph='true' xml='false'/>
+ <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
<ivy:retrieve conf="core" pattern="${ext.dir}/[artifact]-[revision](-[classifier]).[ext]" />
<delete file="${basedir}/release/modules/ext/log4j-1.2.16.jar"/>
</target>
diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml
index 139f205d88..c1db112ce0 100644
--- a/CoreLibs/build.xml
+++ b/CoreLibs/build.xml
@@ -32,7 +32,7 @@
<target name="get-deps" description="retrieve dependencies using ivy" depends="init-ivy,build-native-libs,get-thirdparty-dependencies">
<ivy:settings file="ivysettings.xml" />
<ivy:resolve log="quiet"/>
- <ivy:report todir='${basedir}/ivy-reports' graph='true' xml='false'/>
+ <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
<ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
<delete file="${basedir}/release/modules/ext/log4j-1.2.17.jar"/>
</target>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index e185b9d04d..c2eac09412 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -29,6 +29,9 @@
<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"/>
<!-- <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"/>
--
GitLab