Skip to content
Snippets Groups Projects
Commit f2865349 authored by apriestman's avatar apriestman
Browse files

Fix ivy path.

Add log4j dependencies.
parent d0fe2b20
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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>
......
......@@ -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"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment