updated ivy deps; remove overrides?

This commit is contained in:
Greg DiCristofaro 2024-12-17 14:14:59 -05:00
parent ca1a50a818
commit e44cf29272
6 changed files with 105 additions and 98 deletions

View File

@ -1,5 +1,7 @@
<!DOCTYPE ivy-module [ <!DOCTYPE ivy-module [
<!ENTITY httpcomponents.version "4.5.14"> <!ENTITY httpcomponents.version "4.5.14">
<!ENTITY curator.version "5.7.1">
<!ENTITY batik.version "5.18">
]> ]>
<ivy-module version="2.0"> <ivy-module version="2.0">
<info organisation="org.sleuthkit.autopsy" module="core"/> <info organisation="org.sleuthkit.autopsy" module="core"/>
@ -10,43 +12,43 @@
<dependencies > <dependencies >
<dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" /> <dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" />
<dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="5.16.4"/> <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.4"/>
<dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="5.2.1"/> <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="&curator.version;"/>
<dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="5.2.1"/> <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="&curator.version;"/>
<dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="5.2.1"/> <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="&curator.version;"/>
<dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.2" /> <dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.4" />
<dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/> <dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
<dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.8.0"/> <dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.9.3"/>
<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.1"/> <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.7"/>
<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.1"/> <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.2"/>
<dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.9.0"/> <dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.13.0"/>
<dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.16.1"/> <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.18.3"/>
<dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.18.0"/> <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0"/>
<dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/> <dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/>
<dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.12.45" /> <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.13.52" />
<dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/> <dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
<dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.3"/> <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.5"/>
<!-- for yaml reading/writing --> <!-- for yaml reading/writing -->
<dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2.0"/> <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2.3"/>
<!-- map support for geolocation --> <!-- map support for geolocation -->
<dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.6"/> <dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.8"/>
<!-- for handling diffs --> <!-- for handling diffs -->
<dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.11"/> <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.15"/>
<!-- JAXB --> <!-- JAXB -->
<dependency conf="core->default" org="javax.xml.bind" name="jaxb-api" rev="2.3.1"/> <dependency conf="core->default" org="javax.xml.bind" name="jaxb-api" rev="2.3.1"/>
<dependency conf="core->default" org="org.glassfish.jaxb" name="jaxb-runtime" rev="2.3.3"/> <dependency conf="core->default" org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.5"/>
<dependency conf="core->default" org="org.icepdf.os" name="icepdf-viewer" rev="6.2.2"> <dependency conf="core->default" org="org.icepdf.os" name="icepdf-viewer" rev="6.2.2">
<!-- get the new latest batik items below, override bouncy castle --> <!-- get the new latest batik items below, override bouncy castle -->
@ -62,20 +64,20 @@
<exclude org="com.sun.media" module="jai_imageio"/> <exclude org="com.sun.media" module="jai_imageio"/>
</dependency> </dependency>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="&batik.version;"/>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="&batik.version;"/>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="&batik.version;"/>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="&batik.version;"/>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="&batik.version;"/>
<dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="1.14"/> <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="&batik.version;"/>
<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api --> <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
<dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/> <dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/>
<!-- annotations like guarded by --> <!-- annotations like guarded by -->
<dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.6.0"/> <dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
<dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.1"/> <dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.3"/>
<dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="&httpcomponents.version;"/> <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="&httpcomponents.version;"/>
<dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="&httpcomponents.version;"/> <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="&httpcomponents.version;"/>
@ -83,7 +85,7 @@
<exclude name="jna" /> <exclude name="jna" />
<exclude name="jna-platform" /> <exclude name="jna-platform" />
</dependency> </dependency>
<!--
<override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/> <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="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
@ -92,10 +94,10 @@
<override org="com.google.guava" module="guava" rev="32.0.1-jre"/> <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
<!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> //changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
<override org="junit" module="junit" rev="4.13.2"/> <override org="junit" module="junit" rev="4.13.2"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -1,6 +1,8 @@
<!DOCTYPE ivy-module [ <!DOCTYPE ivy-module [
<!ENTITY javafx.version "17.0.7"> <!ENTITY javafx.version "17.0.14-ea+2">
<!ENTITY jackson.version "2.15.2"> <!ENTITY jackson.version "2.18.2">
<!ENTITY jfxtras.version "17-r1">
<!ENTITY twelvemonkeys.version "3.12.0">
]> ]>
<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra"> <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
<info organisation="org.sleuthkit.autopsy" module="corelibs"/> <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
@ -54,8 +56,8 @@
</dependency> </dependency>
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.12"/> <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.15"/>
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.12"/> <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.15"/>
<!-- apple for swing --> <!-- apple for swing -->
<dependency conf="autopsy_core->default" org="com.apple" name="AppleJavaExtensions" rev="1.4"/> <dependency conf="autopsy_core->default" org="com.apple" name="AppleJavaExtensions" rev="1.4"/>
@ -67,23 +69,23 @@
<!-- for file search --> <!-- for file search -->
<dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="11.2.1"/> <dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="11.2.1"/>
<dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.15"/> <dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.17.1"/>
<!-- Google dependencies (translate needs to be kept with guava because translate depends on guava)--> <!-- Google dependencies (translate needs to be kept with guava because translate depends on guava)-->
<dependency conf="autopsy_core->default" org="com.google.cloud" name="google-cloud-translate" rev="2.1.11"/> <dependency conf="autopsy_core->default" org="com.google.cloud" name="google-cloud-translate" rev="2.54.0"/>
<!-- commmon --> <!-- commmon -->
<dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/> <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
<dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.9.0"/> <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.12.0"/>
<dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-text" rev="1.10.0"/> <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-text" rev="1.13.0"/>
<!-- keep old commons-lang because some deps may need it at runtime. <!-- keep old commons-lang because some deps may need it at runtime.
Note there is no namespace collision with ver 3 --> Note there is no namespace collision with ver 3 -->
<dependency conf="autopsy_core->default" org="commons-lang" name="commons-lang" rev="2.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-logging" name="commons-logging" rev="1.3.4"/>
<dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.11.0"/> <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.18.0"/>
<dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.7"/> <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.9.0"/>
<dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/> <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.5.0-M2"/>
<dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/> <dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
<dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/> <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/>
@ -101,45 +103,45 @@
https://github.com/controlsfx/controlsfx/issues/1241 https://github.com/controlsfx/controlsfx/issues/1241
--> -->
<dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.1.2" /> <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.2.1" />
<dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.10.14" /> <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.13.0" />
<!-- timeline --> <!-- timeline -->
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="17-r1" /> <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="&jfxtras.version;" />
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="17-r1" /> <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="&jfxtras.version;" />
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="17-r1" /> <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="&jfxtras.version;" />
<!-- templateing engine used by timeline to generate its snapshot report --> <!-- templateing engine used by timeline to generate its snapshot report -->
<dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.10" /> <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.14" />
<!-- image support for autopsy and image gallery --> <!-- image support for autopsy and image gallery -->
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.8.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="&twelvemonkeys.version;" />
<dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/> <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="com.googlecode.plist" name="dd-plist" rev="1.28"/>
<dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="1.7.36"/> <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
<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-api" rev="2.24.3" transitive="false"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.2" transitive="false"/> <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.24.3" transitive="false"/>
<exclude org="*" ext="*" type="javadoc"/> <exclude org="*" ext="*" type="javadoc"/>
<exclude org="log4j" module="log4j"/> <exclude org="log4j" module="log4j"/>
<!--
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/> <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/> <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
@ -147,8 +149,8 @@
<override org="com.fasterxml.jackson.core" module="jackson-databind" rev="&jackson.version;"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="&jackson.version;"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="&jackson.version;"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="&jackson.version;"/>
<!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -5,9 +5,9 @@
</configurations> </configurations>
<dependencies > <dependencies >
<dependency conf="coretestlibs->default" org="org.mockito" name="mockito-core" rev="4.8.1"/> <dependency conf="coretestlibs->default" org="org.mockito" name="mockito-core" rev="4.8.1"/>
<dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.12.18"/> <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.15.11"/>
<dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.12.18"/> <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.15.11"/>
<dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.3"/> <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.4"/>
<dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/> <dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -1,5 +1,9 @@
<ivy-module version="2.0"> <!DOCTYPE ivy-module [
<!ENTITY version "2.0">
<!ENTITY jetty.version "12.0.16">
<!ENTITY slf4j.version "2.0.16">
]>
<info organisation="org.sleuthkit.autopsy" module="keywordsearch"/> <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
<configurations > <configurations >
<!-- module dependencies --> <!-- module dependencies -->
@ -17,32 +21,31 @@
<!-- Solr --> <!-- Solr -->
<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.10.4" transitive="false" /> <!-- the war file for embedded Solr 4 --> <dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.10.4" transitive="false" /> <!-- the war file for embedded Solr 4 -->
<dependency conf="solr-libs->default" name="solr-cell" rev="8.11.2" org="org.apache.solr"/> <dependency conf="solr-libs->default" name="solr-cell" rev="8.11.4" org="org.apache.solr"/>
<!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core --> <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
<dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="8.11.2"/> <dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="9.12.1"/>
<!-- Autopsy --> <!-- Autopsy -->
<dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.2"/> <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.4"/>
<dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/> <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.4"/>
<!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/> --> <!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/> -->
<!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> --> <!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> -->
<!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) --> <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
<dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/> <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="76.1"/>
<dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/> <dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/>
<!-- Jetty --> <!-- Jetty -->
<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.15"/> <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="&jetty.version;"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.15"/> <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.15"/> <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="&jetty.version;"/>
<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"/>
<!-- logging --> <!-- logging -->
<dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.36"/> <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="&slf4j.version;"/>
<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="jcl-over-slf4j" rev="&slf4j.version;"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.36"/> <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="&slf4j.version;"/>
<exclude org="*" ext="*" type="javadoc"/> <!-- <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-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-core" rev="2.17.2"/>
@ -50,12 +53,12 @@
<override org="org.apache.logging.log4j" module="log4j-layout-template-json" 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-slf4j-impl" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-web" 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.slf4j" module="slf4j-api" rev="&slf4j.version;"/>
<override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/> <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="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/> <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
<override org="com.google.guava" module="guava" rev="31.1-jre"/> <override org="com.google.guava" module="guava" rev="31.1-jre"/>
<override org="joda-time" module="joda-time" rev="2.10.14" /> <override org="joda-time" module="joda-time" rev="2.10.14" /> -->
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -4,10 +4,10 @@
<conf name="tika"/> <conf name="tika"/>
</configurations> </configurations>
<dependencies > <dependencies >
<dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="1.28.1"/> <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="3.0.0"/>
<dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/> <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
<override org="org.jsoup" module="jsoup" rev="1.16.1"/> <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
<override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/> <override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/> <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/> <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
@ -16,9 +16,9 @@
<override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/>
<override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/>
<!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -7,9 +7,9 @@
</configurations> </configurations>
<dependencies> <dependencies>
<dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.4"/> <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.11"/>
<dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.11.3"/> <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.12.1"/>
<override org="org.jsoup" module="jsoup" rev="1.16.1"/> <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> -->
</dependencies> </dependencies>
</ivy-module> </ivy-module>