diff --git a/Core/ivy.xml b/Core/ivy.xml index db4b10b2283491f9245ac398cb52a48eaf46e8fe..94eb446632c653a857075a1bde080b30bd981d19 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -45,6 +45,12 @@ <!-- 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"/> + <override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/> + <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.guava" module="guava" rev="31.1-jre"/> + <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> </dependencies> </ivy-module> diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 55c8db9105ad750848e02297fe48464d56ed9850..6063cbdcdf9c690e40e93ae9c159fe8586bc3ff7 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -18,7 +18,7 @@ file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar -file.reference.jackson-annotations-2.13.1.jar=release/modules/ext/jackson-annotations-2.13.1.jar +file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar @@ -42,7 +42,7 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.11.1.jar=release/modules/ext/sleuthkit-4.11.1.jar file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuco-4.11.1.jar -file.reference.slf4j-api-1.7.30.jar=release/modules/ext/slf4j-api-1.7.30.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 7e03e6eea337da717262fef347d86393ee2cfea2..8a8c910e0895e88fa47abf494b230096df814880 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -427,8 +427,8 @@ <binary-origin>release/modules/ext/jackcess-encrypt-4.0.1.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jackson-annotations-2.13.1.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jackson-annotations-2.13.1.jar</binary-origin> + <runtime-relative-path>ext/jackson-annotations-2.13.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path> @@ -523,8 +523,8 @@ <binary-origin>release/modules/ext/sleuthkit-caseuco-4.11.1.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/slf4j-api-1.7.30.jar</runtime-relative-path> - <binary-origin>release/modules/ext/slf4j-api-1.7.30.jar</binary-origin> + <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> + <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/snakeyaml-1.30.jar</runtime-relative-path> diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 5947b8c1750394c10ecd01d507f6837475367d07..4b738a55fbeb97968654ab17eae08dac7d62f32d 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -8,6 +8,9 @@ <dependencies> <!-- <dependency conf="autopsy_core->default" org="com.google.code.gson" name="gson" rev="2.9.0"/> --> + <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" rev="1.10.12"/> + <!-- apple for swing --> <dependency conf="autopsy_core->default" org="com.apple" name="AppleJavaExtensions" rev="1.4"/> @@ -42,9 +45,7 @@ <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/> - <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.13.1"/> - <!-- <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.13.2"/> - <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.13.2"/> --> + <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.13.2"/> <!-- process and system monitoring, note: matching native libs pulled from thirdparty --> <dependency conf="autopsy_core->default" org="org.fusesource" name="sigar" rev="1.6.4" /> @@ -85,5 +86,10 @@ <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.23"/> <exclude org="*" ext="*" type="javadoc"/> + + <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.fasterxml.jackson.core" module="jackson-databind" rev="2.13.2"/> + <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> </dependencies> </ivy-module> diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 76b3eda5e63dc747ae967ecc1a3c39b2a74f5b76..36867d55dc790215052d0c2ff64d01953fc1e1d2 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -49,9 +49,9 @@ file.reference.grpc-netty-shaded-1.44.1.jar=release/modules/ext/grpc-netty-shade file.reference.grpc-protobuf-1.44.1.jar=release/modules/ext/grpc-protobuf-1.44.1.jar file.reference.grpc-protobuf-lite-1.44.1.jar=release/modules/ext/grpc-protobuf-lite-1.44.1.jar file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar -file.reference.gson-2.8.9.jar=release/modules/ext/gson-2.8.9.jar +file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar -file.reference.guava-31.0.1-jre.jar=release/modules/ext/guava-31.0.1-jre.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar file.reference.imageio-bmp-3.8.2.jar=release/modules/ext/imageio-bmp-3.8.2.jar @@ -70,9 +70,9 @@ file.reference.imageio-thumbsdb-3.8.2.jar=release/modules/ext/imageio-thumbsdb-3 file.reference.imageio-tiff-3.8.2.jar=release/modules/ext/imageio-tiff-3.8.2.jar file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar -file.reference.jackson-core-2.13.1.jar=release/modules/ext/jackson-core-2.13.1.jar -file.reference.jackson-databind-2.13.1.jar=release/modules/ext/jackson-databind-2.13.1.jar -file.reference.jackson-dataformat-csv-2.13.1.jar=release/modules/ext/jackson-dataformat-csv-2.13.1.jar +file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar +file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar +file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-8.0-r6.jar=release/modules/ext/jfxtras-common-8.0-r6.jar @@ -90,10 +90,6 @@ 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 file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar -file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar -file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar -file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar -file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar file.reference.proto-google-common-protos-2.7.4.jar=release/modules/ext/proto-google-common-protos-2.7.4.jar file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-iam-v1-1.2.6.jar @@ -102,7 +98,6 @@ file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-u file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar -file.reference.xmlbeans-5.0.3.jar=release/modules/ext/xmlbeans-5.0.3.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial nbm.needs.restart=true diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 412689f9287b2b9d9e4064658862cfc551e5e0dc..0d4b34e205fa2425aac599e356483edb8014e79b 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -264,6 +264,7 @@ <package>jfxtras.util</package> <package>net.htmlparser.jericho</package> <package>net.htmlparser.jericho.nodoc</package> + <package>org.apache.tools.ant.types</package> <package>org.apache.commons.codec</package> <package>org.apache.commons.codec.binary</package> <package>org.apache.commons.codec.cli</package> @@ -374,156 +375,6 @@ <package>org.apache.log4j.spi</package> <package>org.apache.log4j.varia</package> <package>org.apache.log4j.xml</package> - <package>org.apache.poi</package> - <package>org.apache.poi.common.usermodel</package> - <package>org.apache.poi.common.usermodel.fonts</package> - <package>org.apache.poi.ddf</package> - <package>org.apache.poi.extractor</package> - <package>org.apache.poi.extractor.ole2</package> - <package>org.apache.poi.hdgf</package> - <package>org.apache.poi.hdgf.chunks</package> - <package>org.apache.poi.hdgf.dev</package> - <package>org.apache.poi.hdgf.exceptions</package> - <package>org.apache.poi.hdgf.extractor</package> - <package>org.apache.poi.hdgf.pointers</package> - <package>org.apache.poi.hdgf.streams</package> - <package>org.apache.poi.hmef</package> - <package>org.apache.poi.hmef.attribute</package> - <package>org.apache.poi.hmef.dev</package> - <package>org.apache.poi.hmef.extractor</package> - <package>org.apache.poi.hpbf</package> - <package>org.apache.poi.hpbf.dev</package> - <package>org.apache.poi.hpbf.extractor</package> - <package>org.apache.poi.hpbf.model</package> - <package>org.apache.poi.hpbf.model.qcbits</package> - <package>org.apache.poi.hpsf</package> - <package>org.apache.poi.hpsf.extractor</package> - <package>org.apache.poi.hpsf.wellknown</package> - <package>org.apache.poi.hslf.blip</package> - <package>org.apache.poi.hslf.dev</package> - <package>org.apache.poi.hslf.exceptions</package> - <package>org.apache.poi.hslf.extractor</package> - <package>org.apache.poi.hslf.model</package> - <package>org.apache.poi.hslf.model.textproperties</package> - <package>org.apache.poi.hslf.record</package> - <package>org.apache.poi.hslf.usermodel</package> - <package>org.apache.poi.hslf.util</package> - <package>org.apache.poi.hsmf</package> - <package>org.apache.poi.hsmf.datatypes</package> - <package>org.apache.poi.hsmf.dev</package> - <package>org.apache.poi.hsmf.exceptions</package> - <package>org.apache.poi.hsmf.extractor</package> - <package>org.apache.poi.hsmf.parsers</package> - <package>org.apache.poi.hssf</package> - <package>org.apache.poi.hssf.converter</package> - <package>org.apache.poi.hssf.eventmodel</package> - <package>org.apache.poi.hssf.eventusermodel</package> - <package>org.apache.poi.hssf.eventusermodel.dummyrecord</package> - <package>org.apache.poi.hssf.extractor</package> - <package>org.apache.poi.hssf.model</package> - <package>org.apache.poi.hssf.record</package> - <package>org.apache.poi.hssf.record.aggregates</package> - <package>org.apache.poi.hssf.record.cf</package> - <package>org.apache.poi.hssf.record.chart</package> - <package>org.apache.poi.hssf.record.common</package> - <package>org.apache.poi.hssf.record.cont</package> - <package>org.apache.poi.hssf.record.crypto</package> - <package>org.apache.poi.hssf.record.pivottable</package> - <package>org.apache.poi.hssf.usermodel</package> - <package>org.apache.poi.hssf.usermodel.helpers</package> - <package>org.apache.poi.hssf.util</package> - <package>org.apache.poi.hwmf.draw</package> - <package>org.apache.poi.hwmf.record</package> - <package>org.apache.poi.hwmf.usermodel</package> - <package>org.apache.poi.hwpf</package> - <package>org.apache.poi.hwpf.converter</package> - <package>org.apache.poi.hwpf.dev</package> - <package>org.apache.poi.hwpf.extractor</package> - <package>org.apache.poi.hwpf.model</package> - <package>org.apache.poi.hwpf.model.io</package> - <package>org.apache.poi.hwpf.model.types</package> - <package>org.apache.poi.hwpf.sprm</package> - <package>org.apache.poi.hwpf.usermodel</package> - <package>org.apache.poi.ooxml</package> - <package>org.apache.poi.ooxml.extractor</package> - <package>org.apache.poi.ooxml.util</package> - <package>org.apache.poi.openxml4j.exceptions</package> - <package>org.apache.poi.openxml4j.opc</package> - <package>org.apache.poi.openxml4j.opc.internal</package> - <package>org.apache.poi.openxml4j.opc.internal.marshallers</package> - <package>org.apache.poi.openxml4j.opc.internal.unmarshallers</package> - <package>org.apache.poi.openxml4j.util</package> - <package>org.apache.poi.poifs.common</package> - <package>org.apache.poi.poifs.crypt</package> - <package>org.apache.poi.poifs.crypt.agile</package> - <package>org.apache.poi.poifs.crypt.binaryrc4</package> - <package>org.apache.poi.poifs.crypt.cryptoapi</package> - <package>org.apache.poi.poifs.crypt.dsig</package> - <package>org.apache.poi.poifs.crypt.dsig.facets</package> - <package>org.apache.poi.poifs.crypt.dsig.services</package> - <package>org.apache.poi.poifs.crypt.standard</package> - <package>org.apache.poi.poifs.crypt.temp</package> - <package>org.apache.poi.poifs.crypt.xor</package> - <package>org.apache.poi.poifs.dev</package> - <package>org.apache.poi.poifs.eventfilesystem</package> - <package>org.apache.poi.poifs.filesystem</package> - <package>org.apache.poi.poifs.macros</package> - <package>org.apache.poi.poifs.nio</package> - <package>org.apache.poi.poifs.property</package> - <package>org.apache.poi.poifs.storage</package> - <package>org.apache.poi.sl.draw</package> - <package>org.apache.poi.sl.draw.geom</package> - <package>org.apache.poi.sl.extractor</package> - <package>org.apache.poi.sl.image</package> - <package>org.apache.poi.sl.usermodel</package> - <package>org.apache.poi.ss</package> - <package>org.apache.poi.ss.extractor</package> - <package>org.apache.poi.ss.format</package> - <package>org.apache.poi.ss.formula</package> - <package>org.apache.poi.ss.formula.atp</package> - <package>org.apache.poi.ss.formula.constant</package> - <package>org.apache.poi.ss.formula.eval</package> - <package>org.apache.poi.ss.formula.eval.forked</package> - <package>org.apache.poi.ss.formula.function</package> - <package>org.apache.poi.ss.formula.functions</package> - <package>org.apache.poi.ss.formula.ptg</package> - <package>org.apache.poi.ss.formula.udf</package> - <package>org.apache.poi.ss.usermodel</package> - <package>org.apache.poi.ss.usermodel.helpers</package> - <package>org.apache.poi.ss.util</package> - <package>org.apache.poi.ss.util.cellwalk</package> - <package>org.apache.poi.util</package> - <package>org.apache.poi.wp.usermodel</package> - <package>org.apache.poi.xddf.usermodel</package> - <package>org.apache.poi.xddf.usermodel.chart</package> - <package>org.apache.poi.xddf.usermodel.text</package> - <package>org.apache.poi.xdgf.exceptions</package> - <package>org.apache.poi.xdgf.extractor</package> - <package>org.apache.poi.xdgf.geom</package> - <package>org.apache.poi.xdgf.usermodel</package> - <package>org.apache.poi.xdgf.usermodel.section</package> - <package>org.apache.poi.xdgf.usermodel.section.geometry</package> - <package>org.apache.poi.xdgf.usermodel.shape</package> - <package>org.apache.poi.xdgf.usermodel.shape.exceptions</package> - <package>org.apache.poi.xdgf.util</package> - <package>org.apache.poi.xdgf.xml</package> - <package>org.apache.poi.xslf.extractor</package> - <package>org.apache.poi.xslf.model</package> - <package>org.apache.poi.xslf.usermodel</package> - <package>org.apache.poi.xslf.util</package> - <package>org.apache.poi.xssf</package> - <package>org.apache.poi.xssf.binary</package> - <package>org.apache.poi.xssf.eventusermodel</package> - <package>org.apache.poi.xssf.extractor</package> - <package>org.apache.poi.xssf.model</package> - <package>org.apache.poi.xssf.streaming</package> - <package>org.apache.poi.xssf.usermodel</package> - <package>org.apache.poi.xssf.usermodel.extensions</package> - <package>org.apache.poi.xssf.usermodel.helpers</package> - <package>org.apache.poi.xssf.util</package> - <package>org.apache.poi.xwpf.extractor</package> - <package>org.apache.poi.xwpf.model</package> - <package>org.apache.poi.xwpf.usermodel</package> <package>org.apache.tools.ant</package> <package>org.apache.tools.ant.dispatch</package> <package>org.apache.tools.ant.filters</package> @@ -584,37 +435,6 @@ <package>org.apache.tools.mail</package> <package>org.apache.tools.tar</package> <package>org.apache.tools.zip</package> - <package>org.apache.xmlbeans</package> - <package>org.apache.xmlbeans.impl.common</package> - <package>org.apache.xmlbeans.impl.config</package> - <package>org.apache.xmlbeans.impl.inst2xsd</package> - <package>org.apache.xmlbeans.impl.inst2xsd.util</package> - <package>org.apache.xmlbeans.impl.regex</package> - <package>org.apache.xmlbeans.impl.richParser</package> - <package>org.apache.xmlbeans.impl.schema</package> - <package>org.apache.xmlbeans.impl.soap</package> - <package>org.apache.xmlbeans.impl.store</package> - <package>org.apache.xmlbeans.impl.tool</package> - <package>org.apache.xmlbeans.impl.util</package> - <package>org.apache.xmlbeans.impl.validator</package> - <package>org.apache.xmlbeans.impl.values</package> - <package>org.apache.xmlbeans.impl.xb.ltgfmt</package> - <package>org.apache.xmlbeans.impl.xb.ltgfmt.impl</package> - <package>org.apache.xmlbeans.impl.xb.substwsdl</package> - <package>org.apache.xmlbeans.impl.xb.substwsdl.impl</package> - <package>org.apache.xmlbeans.impl.xb.xmlconfig</package> - <package>org.apache.xmlbeans.impl.xb.xmlconfig.impl</package> - <package>org.apache.xmlbeans.impl.xb.xmlschema</package> - <package>org.apache.xmlbeans.impl.xb.xmlschema.impl</package> - <package>org.apache.xmlbeans.impl.xb.xsdownload</package> - <package>org.apache.xmlbeans.impl.xb.xsdownload.impl</package> - <package>org.apache.xmlbeans.impl.xb.xsdschema</package> - <package>org.apache.xmlbeans.impl.xb.xsdschema.impl</package> - <package>org.apache.xmlbeans.impl.xpathgen</package> - <package>org.apache.xmlbeans.impl.xsd2inst</package> - <package>org.apache.xmlbeans.soap</package> - <package>org.apache.xmlbeans.xml.stream</package> - <package>org.apache.xmlbeans.xml.stream.events</package> <package>org.controlsfx.control</package> <package>org.controlsfx.control.action</package> <package>org.controlsfx.control.cell</package> @@ -904,16 +724,16 @@ <binary-origin>release/modules/ext/grpc-stub-1.44.1.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/gson-2.8.9.jar</runtime-relative-path> - <binary-origin>release/modules/ext/gson-2.8.9.jar</binary-origin> + <runtime-relative-path>ext/gson-2.9.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/gst1-java-core-1.4.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/gst1-java-core-1.4.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/guava-31.0.1-jre.jar</runtime-relative-path> - <binary-origin>release/modules/ext/guava-31.0.1-jre.jar</binary-origin> + <runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path> + <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path> @@ -988,16 +808,16 @@ <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jackson-core-2.13.1.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jackson-core-2.13.1.jar</binary-origin> + <runtime-relative-path>ext/jackson-core-2.13.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-core-2.13.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jackson-databind-2.13.1.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jackson-databind-2.13.1.jar</binary-origin> + <runtime-relative-path>ext/jackson-databind-2.13.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-databind-2.13.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jackson-dataformat-csv-2.13.1.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.1.jar</binary-origin> + <runtime-relative-path>ext/jackson-dataformat-csv-2.13.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.2.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path> @@ -1067,22 +887,6 @@ <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path> <binary-origin>release/modules/ext/opencv-248.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/poi-4.1.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/poi-4.1.2.jar</binary-origin> - </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/poi-ooxml-4.1.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/poi-ooxml-4.1.2.jar</binary-origin> - </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/poi-ooxml-schemas-4.1.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/poi-ooxml-schemas-4.1.2.jar</binary-origin> - </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/poi-scratchpad-4.1.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/poi-scratchpad-4.1.2.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</runtime-relative-path> <binary-origin>release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</binary-origin> @@ -1115,10 +919,6 @@ <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/xmlbeans-5.0.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/xmlbeans-5.0.3.jar</binary-origin> - </class-path-extension> </data> </configuration> </project> diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 76a9fc758ac098d5dfc5449e68e30fec1c1922ee..0c6c07f70561870ddccb0e741a3114b9310b4b0c 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -22,7 +22,7 @@ <!-- Autopsy --> <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/> <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/> - <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.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) --> @@ -33,7 +33,13 @@ <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="8.1.16.v20140903"/> <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.16.v20140903"/> <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> --> - + <exclude org="*" ext="*" type="javadoc"/> + <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"/> + <override org="com.google.guava" module="guava" rev="31.1-jre"/> + <override org="joda-time" module="joda-time" rev="2.10.14" /> </dependencies> </ivy-module> diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 01169ed1e08435f96559fab47c4742d010f9abe3..6608c1ccc12b7fa9122e65d8c74e336e1ec5b3bf 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -15,7 +15,7 @@ file.reference.icu4j-70.1.jar=release/modules/ext/icu4j-70.1.jar file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar file.reference.jcommander-1.82.jar=release/modules/ext/jcommander-1.82.jar -file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar +file.reference.joda-time-2.10.4.jar=release/modules/ext/joda-time-2.10.4.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 8945867f1b8ee8b854cb514096052546384ba34e..95ea662d40634e1a1234f761fbfc83aa98e74f06 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -285,8 +285,8 @@ <binary-origin>release/modules/ext/jcommander-1.82.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin> + <runtime-relative-path>ext/joda-time-2.10.4.jar</runtime-relative-path> + <binary-origin>release/modules/ext/joda-time-2.10.4.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path> diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml index e9ef88585135b3a710b77794c1f22041c9cb484e..d4bde929509159fba6396722968f8ee5335efc91 100644 --- a/RecentActivity/nbproject/project.xml +++ b/RecentActivity/nbproject/project.xml @@ -54,6 +54,15 @@ <specification-version>9.4.1</specification-version> </run-dependency> </dependency> + <dependency> + <code-name-base>org.sleuthkit.autopsy.Tika</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <release-version>1</release-version> + <specification-version>23</specification-version> + </run-dependency> + </dependency> <dependency> <code-name-base>org.sleuthkit.autopsy.core</code-name-base> <build-prerequisite/> diff --git a/Tika/ivy.xml b/Tika/ivy.xml index 1575f50c1523b4f37ef17f80c82e58d03f96a6eb..10464eb16e84581059ab166d04b9bf886018e232 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -5,5 +5,13 @@ </configurations> <dependencies > <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="1.28.1"/> + <override org="org.jsoup" module="jsoup" rev="1.14.3"/> + <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="com.google.code.gson" module="gson" rev="2.9.0"/> + <override org="com.google.guava" module="guava" rev="31.1-jre"/> + <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> + <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.13.2"/> + <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.13.2"/> </dependencies> </ivy-module> diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index bb647d537f110748ba3ab8f1702b5bc66802ae5b..d2276efd9d4f5680c8c532dc7c0ae0b80cdf9106 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -56,7 +56,7 @@ file.reference.jempbox-1.8.16.jar=release/modules/ext/jempbox-1.8.16.jar file.reference.jhighlight-1.0.3.jar=release/modules/ext/jhighlight-1.0.3.jar file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar -file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar +file.reference.joda-time-2.10.4.jar=release/modules/ext/joda-time-2.10.4.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar @@ -71,6 +71,10 @@ file.reference.opennlp-tools-1.9.4.jar=release/modules/ext/opennlp-tools-1.9.4.j file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar file.reference.pdfbox-2.0.25.jar=release/modules/ext/pdfbox-2.0.25.jar file.reference.pdfbox-tools-2.0.25.jar=release/modules/ext/pdfbox-tools-2.0.25.jar +file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar +file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar +file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar +file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar file.reference.quartz-2.3.2.jar=release/modules/ext/quartz-2.3.2.jar file.reference.rome-1.18.0.jar=release/modules/ext/rome-1.18.0.jar @@ -96,6 +100,7 @@ file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8 file.reference.woodstox-core-6.2.8.jar=release/modules/ext/woodstox-core-6.2.8.jar file.reference.xercesImpl-2.12.2.jar=release/modules/ext/xercesImpl-2.12.2.jar file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar +file.reference.xmlbeans-3.1.0.jar=release/modules/ext/xmlbeans-3.1.0.jar file.reference.xmlschema-core-2.3.0.jar=release/modules/ext/xmlschema-core-2.3.0.jar file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar file.reference.xz-1.9.jar=release/modules/ext/xz-1.9.jar diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index 9c892e1796e2d7a2bec34acd31115c2a5de0978c..af1016a3ac1c6d16b026372c3761aa1813e8f5b2 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -9,8 +9,161 @@ <public-packages> <package>org.apache.james.mime4j</package> <package>org.apache.james.mime4j.dom</package> + <package>org.apache.james.mime4j.dom.address</package> + <package>org.apache.james.mime4j.dom.field</package> <package>org.apache.james.mime4j.message</package> <package>org.apache.james.mime4j.stream</package> + <package>org.apache.poi</package> + <package>org.apache.poi.common.usermodel</package> + <package>org.apache.poi.common.usermodel.fonts</package> + <package>org.apache.poi.ddf</package> + <package>org.apache.poi.extractor</package> + <package>org.apache.poi.extractor.ole2</package> + <package>org.apache.poi.hdgf</package> + <package>org.apache.poi.hdgf.chunks</package> + <package>org.apache.poi.hdgf.dev</package> + <package>org.apache.poi.hdgf.exceptions</package> + <package>org.apache.poi.hdgf.extractor</package> + <package>org.apache.poi.hdgf.pointers</package> + <package>org.apache.poi.hdgf.streams</package> + <package>org.apache.poi.hmef</package> + <package>org.apache.poi.hmef.attribute</package> + <package>org.apache.poi.hmef.dev</package> + <package>org.apache.poi.hmef.extractor</package> + <package>org.apache.poi.hpbf</package> + <package>org.apache.poi.hpbf.dev</package> + <package>org.apache.poi.hpbf.extractor</package> + <package>org.apache.poi.hpbf.model</package> + <package>org.apache.poi.hpbf.model.qcbits</package> + <package>org.apache.poi.hpsf</package> + <package>org.apache.poi.hpsf.extractor</package> + <package>org.apache.poi.hpsf.wellknown</package> + <package>org.apache.poi.hslf.blip</package> + <package>org.apache.poi.hslf.dev</package> + <package>org.apache.poi.hslf.exceptions</package> + <package>org.apache.poi.hslf.extractor</package> + <package>org.apache.poi.hslf.model</package> + <package>org.apache.poi.hslf.model.textproperties</package> + <package>org.apache.poi.hslf.record</package> + <package>org.apache.poi.hslf.usermodel</package> + <package>org.apache.poi.hslf.util</package> + <package>org.apache.poi.hsmf</package> + <package>org.apache.poi.hsmf.datatypes</package> + <package>org.apache.poi.hsmf.dev</package> + <package>org.apache.poi.hsmf.exceptions</package> + <package>org.apache.poi.hsmf.extractor</package> + <package>org.apache.poi.hsmf.parsers</package> + <package>org.apache.poi.hssf</package> + <package>org.apache.poi.hssf.converter</package> + <package>org.apache.poi.hssf.eventmodel</package> + <package>org.apache.poi.hssf.eventusermodel</package> + <package>org.apache.poi.hssf.eventusermodel.dummyrecord</package> + <package>org.apache.poi.hssf.extractor</package> + <package>org.apache.poi.hssf.model</package> + <package>org.apache.poi.hssf.record</package> + <package>org.apache.poi.hssf.record.aggregates</package> + <package>org.apache.poi.hssf.record.cf</package> + <package>org.apache.poi.hssf.record.chart</package> + <package>org.apache.poi.hssf.record.common</package> + <package>org.apache.poi.hssf.record.cont</package> + <package>org.apache.poi.hssf.record.crypto</package> + <package>org.apache.poi.hssf.record.pivottable</package> + <package>org.apache.poi.hssf.usermodel</package> + <package>org.apache.poi.hssf.usermodel.helpers</package> + <package>org.apache.poi.hssf.util</package> + <package>org.apache.poi.hwmf.draw</package> + <package>org.apache.poi.hwmf.record</package> + <package>org.apache.poi.hwmf.usermodel</package> + <package>org.apache.poi.hwpf</package> + <package>org.apache.poi.hwpf.converter</package> + <package>org.apache.poi.hwpf.dev</package> + <package>org.apache.poi.hwpf.extractor</package> + <package>org.apache.poi.hwpf.model</package> + <package>org.apache.poi.hwpf.model.io</package> + <package>org.apache.poi.hwpf.model.types</package> + <package>org.apache.poi.hwpf.sprm</package> + <package>org.apache.poi.hwpf.usermodel</package> + <package>org.apache.poi.ooxml</package> + <package>org.apache.poi.ooxml.extractor</package> + <package>org.apache.poi.ooxml.util</package> + <package>org.apache.poi.openxml4j.exceptions</package> + <package>org.apache.poi.openxml4j.opc</package> + <package>org.apache.poi.openxml4j.opc.internal</package> + <package>org.apache.poi.openxml4j.opc.internal.marshallers</package> + <package>org.apache.poi.openxml4j.opc.internal.unmarshallers</package> + <package>org.apache.poi.openxml4j.util</package> + <package>org.apache.poi.poifs.common</package> + <package>org.apache.poi.poifs.crypt</package> + <package>org.apache.poi.poifs.crypt.agile</package> + <package>org.apache.poi.poifs.crypt.binaryrc4</package> + <package>org.apache.poi.poifs.crypt.cryptoapi</package> + <package>org.apache.poi.poifs.crypt.dsig</package> + <package>org.apache.poi.poifs.crypt.dsig.facets</package> + <package>org.apache.poi.poifs.crypt.dsig.services</package> + <package>org.apache.poi.poifs.crypt.standard</package> + <package>org.apache.poi.poifs.crypt.temp</package> + <package>org.apache.poi.poifs.crypt.xor</package> + <package>org.apache.poi.poifs.dev</package> + <package>org.apache.poi.poifs.eventfilesystem</package> + <package>org.apache.poi.poifs.filesystem</package> + <package>org.apache.poi.poifs.macros</package> + <package>org.apache.poi.poifs.nio</package> + <package>org.apache.poi.poifs.property</package> + <package>org.apache.poi.poifs.storage</package> + <package>org.apache.poi.sl.draw</package> + <package>org.apache.poi.sl.draw.geom</package> + <package>org.apache.poi.sl.extractor</package> + <package>org.apache.poi.sl.image</package> + <package>org.apache.poi.sl.usermodel</package> + <package>org.apache.poi.ss</package> + <package>org.apache.poi.ss.extractor</package> + <package>org.apache.poi.ss.format</package> + <package>org.apache.poi.ss.formula</package> + <package>org.apache.poi.ss.formula.atp</package> + <package>org.apache.poi.ss.formula.constant</package> + <package>org.apache.poi.ss.formula.eval</package> + <package>org.apache.poi.ss.formula.eval.forked</package> + <package>org.apache.poi.ss.formula.function</package> + <package>org.apache.poi.ss.formula.functions</package> + <package>org.apache.poi.ss.formula.ptg</package> + <package>org.apache.poi.ss.formula.udf</package> + <package>org.apache.poi.ss.usermodel</package> + <package>org.apache.poi.ss.usermodel.helpers</package> + <package>org.apache.poi.ss.util</package> + <package>org.apache.poi.ss.usermodel.charts</package> + <package>org.apache.poi.ss.util.cellwalk</package> + <package>org.apache.poi.util</package> + <package>org.apache.poi.wp.usermodel</package> + <package>org.apache.poi.xddf.usermodel</package> + <package>org.apache.poi.xddf.usermodel.chart</package> + <package>org.apache.poi.xddf.usermodel.text</package> + <package>org.apache.poi.xdgf.exceptions</package> + <package>org.apache.poi.xdgf.extractor</package> + <package>org.apache.poi.xdgf.geom</package> + <package>org.apache.poi.xdgf.usermodel</package> + <package>org.apache.poi.xdgf.usermodel.section</package> + <package>org.apache.poi.xdgf.usermodel.section.geometry</package> + <package>org.apache.poi.xdgf.usermodel.shape</package> + <package>org.apache.poi.xdgf.usermodel.shape.exceptions</package> + <package>org.apache.poi.xdgf.util</package> + <package>org.apache.poi.xdgf.xml</package> + <package>org.apache.poi.xslf.extractor</package> + <package>org.apache.poi.xslf.model</package> + <package>org.apache.poi.xslf.usermodel</package> + <package>org.apache.poi.xslf.util</package> + <package>org.apache.poi.xssf</package> + <package>org.apache.poi.xssf.binary</package> + <package>org.apache.poi.xssf.eventusermodel</package> + <package>org.apache.poi.xssf.extractor</package> + <package>org.apache.poi.xssf.model</package> + <package>org.apache.poi.xssf.streaming</package> + <package>org.apache.poi.xssf.usermodel</package> + <package>org.apache.poi.xssf.usermodel.extensions</package> + <package>org.apache.poi.xssf.usermodel.helpers</package> + <package>org.apache.poi.xssf.util</package> + <package>org.apache.poi.xwpf.extractor</package> + <package>org.apache.poi.xwpf.model</package> + <package>org.apache.poi.xwpf.usermodel</package> <package>org.apache.tika</package> <package>org.apache.tika.concurrent</package> <package>org.apache.tika.config</package> @@ -113,6 +266,37 @@ <package>org.apache.tika.sax</package> <package>org.apache.tika.sax.xpath</package> <package>org.apache.tika.utils</package> + <package>org.apache.xmlbeans</package> + <package>org.apache.xmlbeans.impl.common</package> + <package>org.apache.xmlbeans.impl.config</package> + <package>org.apache.xmlbeans.impl.inst2xsd</package> + <package>org.apache.xmlbeans.impl.inst2xsd.util</package> + <package>org.apache.xmlbeans.impl.regex</package> + <package>org.apache.xmlbeans.impl.richParser</package> + <package>org.apache.xmlbeans.impl.schema</package> + <package>org.apache.xmlbeans.impl.soap</package> + <package>org.apache.xmlbeans.impl.store</package> + <package>org.apache.xmlbeans.impl.tool</package> + <package>org.apache.xmlbeans.impl.util</package> + <package>org.apache.xmlbeans.impl.validator</package> + <package>org.apache.xmlbeans.impl.values</package> + <package>org.apache.xmlbeans.impl.xb.ltgfmt</package> + <package>org.apache.xmlbeans.impl.xb.ltgfmt.impl</package> + <package>org.apache.xmlbeans.impl.xb.substwsdl</package> + <package>org.apache.xmlbeans.impl.xb.substwsdl.impl</package> + <package>org.apache.xmlbeans.impl.xb.xmlconfig</package> + <package>org.apache.xmlbeans.impl.xb.xmlconfig.impl</package> + <package>org.apache.xmlbeans.impl.xb.xmlschema</package> + <package>org.apache.xmlbeans.impl.xb.xmlschema.impl</package> + <package>org.apache.xmlbeans.impl.xb.xsdownload</package> + <package>org.apache.xmlbeans.impl.xb.xsdownload.impl</package> + <package>org.apache.xmlbeans.impl.xb.xsdschema</package> + <package>org.apache.xmlbeans.impl.xb.xsdschema.impl</package> + <package>org.apache.xmlbeans.impl.xpathgen</package> + <package>org.apache.xmlbeans.impl.xsd2inst</package> + <package>org.apache.xmlbeans.soap</package> + <package>org.apache.xmlbeans.xml.stream</package> + <package>org.apache.xmlbeans.xml.stream.events</package> </public-packages> <class-path-extension> <runtime-relative-path>ext/HikariCP-java7-2.4.13.jar</runtime-relative-path> @@ -347,8 +531,8 @@ <binary-origin>release/modules/ext/jna-5.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin> + <runtime-relative-path>ext/joda-time-2.10.4.jar</runtime-relative-path> + <binary-origin>release/modules/ext/joda-time-2.10.4.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path> @@ -406,6 +590,22 @@ <runtime-relative-path>ext/pdfbox-tools-2.0.25.jar</runtime-relative-path> <binary-origin>release/modules/ext/pdfbox-tools-2.0.25.jar</binary-origin> </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/poi-4.1.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/poi-4.1.2.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/poi-ooxml-4.1.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/poi-ooxml-4.1.2.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/poi-ooxml-schemas-4.1.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/poi-ooxml-schemas-4.1.2.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/poi-scratchpad-4.1.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/poi-scratchpad-4.1.2.jar</binary-origin> + </class-path-extension> <class-path-extension> <runtime-relative-path>ext/protobuf-java-3.19.4.jar</runtime-relative-path> <binary-origin>release/modules/ext/protobuf-java-3.19.4.jar</binary-origin> @@ -506,6 +706,10 @@ <runtime-relative-path>ext/xml-apis-1.4.01.jar</runtime-relative-path> <binary-origin>release/modules/ext/xml-apis-1.4.01.jar</binary-origin> </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/xmlbeans-3.1.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/xmlbeans-3.1.0.jar</binary-origin> + </class-path-extension> <class-path-extension> <runtime-relative-path>ext/xmlschema-core-2.3.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/xmlschema-core-2.3.0.jar</binary-origin> diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml index 227611d63d049c105fb894c6b4ea9fd329eae382..0efca69cb5a1f62658f3c15d7b00f73ee19b6755 100644 --- a/thunderbirdparser/ivy.xml +++ b/thunderbirdparser/ivy.xml @@ -7,7 +7,9 @@ </configurations> <dependencies> - <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.6"/> + <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.4"/> <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.11.3"/> + <override org="org.jsoup" module="jsoup" rev="1.14.3"/> + <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> </dependencies> </ivy-module>