mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-11 23:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ivy path.

Browse Source 
Add log4j dependencies.
This commit is contained in:
apriestman 2022-01-12 10:31:13 -05:00
parent d0fe2b2067
commit f28653491d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/build.xml
View File

@ -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>

2
CoreLibs/build.xml
View File

@ -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>

3
CoreLibs/ivy.xml
View File

@ -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"/>