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

log4j updates

Browse Source
This commit is contained in:
Greg DiCristofaro 2022-04-07 15:18:43 -04:00
parent 39978303ec
commit 7c33649411
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CoreLibs/ivy.xml
View File

@ -34,7 +34,6 @@
<dependency conf="autopsy_core->default" org="commons-lang" name="commons-lang" rev="2.6"/>
<dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.2"/>
<dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.11.0"/>
<dependency conf="autopsy_core->default" org="log4j" name="log4j" rev="1.2.17"/>
<dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.7"/>
<dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/>
<dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
@ -83,10 +82,13 @@
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.8.2" />
<dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
<dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.23"/>
<dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="1.7.36"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="2.17.2" transitive="false"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.2" transitive="false"/>
<exclude org="*" ext="*" type="javadoc"/>
<exclude org="log4j" module="log4j"/>
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>

3
CoreLibs/nbproject/project.properties
View File

@ -94,7 +94,8 @@ file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar
file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar
file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
file.reference.log4j-api-2.17.2.jar=release/modules/ext/log4j-api-2.17.2.jar
file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar
file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar

8
CoreLibs/nbproject/project.xml
View File

@ -849,8 +849,12 @@
<binary-origin>release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
<binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
<runtime-relative-path>ext/log4j-api-2.17.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/log4j-api-2.17.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<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/ooxml-schemas-1.4.jar</runtime-relative-path>

18
KeywordSearch/ivy.xml
View File

@ -29,13 +29,27 @@
<dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/>
<!-- Jetty -->
<!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.8"/>
<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.8"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.8"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.8"/>
<dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> -->
<dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.36"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.36"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.36"/>
<exclude org="*" ext="*" type="javadoc"/>
<override org="org.apache.logging.log4j" module="log4j-api" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-core" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
<override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/>