This commit is contained in:
Greg DiCristofaro 2025-01-06 21:35:03 -05:00
parent ac15a60c80
commit dd18d571bf
No known key found for this signature in database
18 changed files with 151 additions and 131 deletions

View File

@ -7,6 +7,7 @@
<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 org="jakarta.jms" name="jakarta.jms-api" rev="3.1.0"/>
<dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.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="${curator.version}"/> <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="${curator.version}"/> <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="${curator.version}"/>

View File

@ -47,6 +47,9 @@ 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.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar
file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar
file.reference.jakarta.annotation-api-2.1.1.jar=release/modules/ext/jakarta.annotation-api-2.1.1.jar file.reference.jakarta.annotation-api-2.1.1.jar=release/modules/ext/jakarta.annotation-api-2.1.1.jar
file.reference.jakarta.jms-api-3.1.0-javadoc.jar=release/modules/ext/jakarta.jms-api-3.1.0-javadoc.jar
file.reference.jakarta.jms-api-3.1.0-sources.jar=release/modules/ext/jakarta.jms-api-3.1.0-sources.jar
file.reference.jakarta.jms-api-3.1.0.jar=release/modules/ext/jakarta.jms-api-3.1.0.jar
file.reference.jakarta.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar file.reference.jakarta.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar
file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar

View File

@ -565,6 +565,18 @@
<runtime-relative-path>ext/jakarta.annotation-api-2.1.1.jar</runtime-relative-path> <runtime-relative-path>ext/jakarta.annotation-api-2.1.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jakarta.annotation-api-2.1.1.jar</binary-origin> <binary-origin>release/modules/ext/jakarta.annotation-api-2.1.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jakarta.jms-api-3.1.0-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jakarta.jms-api-3.1.0-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jakarta.jms-api-3.1.0-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jakarta.jms-api-3.1.0-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jakarta.jms-api-3.1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jakarta.jms-api-3.1.0.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jakarta.transaction-api-1.3.3.jar</runtime-relative-path> <runtime-relative-path>ext/jakarta.transaction-api-1.3.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jakarta.transaction-api-1.3.3.jar</binary-origin> <binary-origin>release/modules/ext/jakarta.transaction-api-1.3.3.jar</binary-origin>

View File

@ -24,7 +24,7 @@ import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.jms.JMSException; import jakarta.jms.JMSException;
import org.sleuthkit.autopsy.core.UserPreferencesException; import org.sleuthkit.autopsy.core.UserPreferencesException;
import org.sleuthkit.autopsy.core.UserPreferences; import org.sleuthkit.autopsy.core.UserPreferences;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;

View File

@ -21,8 +21,8 @@ package org.sleuthkit.autopsy.events;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
import javax.jms.Connection; import jakarta.jms.Connection;
import javax.jms.JMSException; import jakarta.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;

View File

@ -22,16 +22,16 @@ import java.net.URISyntaxException;
import java.util.logging.Level; import java.util.logging.Level;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.jms.Connection; import jakarta.jms.Connection;
import javax.jms.DeliveryMode; import jakarta.jms.DeliveryMode;
import javax.jms.JMSException; import jakarta.jms.JMSException;
import javax.jms.Message; import jakarta.jms.Message;
import javax.jms.MessageConsumer; import jakarta.jms.MessageConsumer;
import javax.jms.MessageListener; import jakarta.jms.MessageListener;
import javax.jms.MessageProducer; import jakarta.jms.MessageProducer;
import javax.jms.ObjectMessage; import jakarta.jms.ObjectMessage;
import javax.jms.Session; import jakarta.jms.Session;
import javax.jms.Topic; import jakarta.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;

View File

@ -50,6 +50,7 @@ import org.apache.tika.exception.TikaException;
import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.EmbeddedDocumentExtractor;
import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor;
import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MediaType;
import org.apache.tika.mime.MimeTypeException; import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.AutoDetectParser;
@ -728,7 +729,7 @@ class DocumentEmbeddedContentExtractor {
} }
// try to get the name of the embedded file from the metadata // try to get the name of the embedded file from the metadata
String name = metadata.get(Metadata.RESOURCE_NAME_KEY); String name = metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY);
// TODO: This can be removed after we upgrade to Tika 1.16 or // TODO: This can be removed after we upgrade to Tika 1.16 or
// above. The 1.16 version of Tika keeps track of files that // above. The 1.16 version of Tika keeps track of files that

View File

@ -30,6 +30,7 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.tika.exception.TikaException; import org.apache.tika.exception.TikaException;
import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.EmbeddedDocumentExtractor;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.ParseContext;
@ -125,7 +126,7 @@ final class PDFAttachmentExtractor {
//Resource naming scheme is used internally in autopsy, therefore we can guarentee uniqueness. //Resource naming scheme is used internally in autopsy, therefore we can guarentee uniqueness.
String uniqueExtractedName = "extract_" + attachmentCount++; //NON-NLS String uniqueExtractedName = "extract_" + attachmentCount++; //NON-NLS
String name = mtdt.get(Metadata.RESOURCE_NAME_KEY); String name = mtdt.get(TikaCoreProperties.RESOURCE_NAME_KEY);
String ext = FilenameUtils.getExtension(name); String ext = FilenameUtils.getExtension(name);
//Append the extension if we can. //Append the extension if we can.

View File

@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.logging.Level; import java.util.logging.Level;
import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.EncryptedDocumentException;
import org.apache.tika.exception.TikaException; import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.ParseContext;
@ -287,7 +288,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
bin = new BufferedInputStream(in); bin = new BufferedInputStream(in);
ContentHandler handler = new BodyContentHandler(-1); ContentHandler handler = new BodyContentHandler(-1);
Metadata metadata = new Metadata(); Metadata metadata = new Metadata();
metadata.add(Metadata.RESOURCE_NAME_KEY, file.getName()); metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, file.getName());
AutoDetectParser parser = new AutoDetectParser(); AutoDetectParser parser = new AutoDetectParser();
parser.parse(bin, handler, metadata, new ParseContext()); parser.parse(bin, handler, metadata, new ParseContext());
} catch (EncryptedDocumentException ex) { } catch (EncryptedDocumentException ex) {

View File

@ -75,6 +75,7 @@ import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.mime.MimeTypes; import org.apache.tika.mime.MimeTypes;
import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY; import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY;
import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator; import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator;
@ -282,11 +283,7 @@ final class TikaTextExtractor implements TextExtractor {
if (isOcrSupported()) { if (isOcrSupported()) {
// Configure OCR for Tika if it chooses to run OCR // Configure OCR for Tika if it chooses to run OCR
// during extraction // during extraction
TesseractOCRConfig ocrConfig = new TesseractOCRConfig(); TesseractOCRConfig ocrConfig = getTesseractConfig();
String tesseractFolder = TESSERACT_PATH.getParent();
ocrConfig.setTesseractPath(tesseractFolder);
ocrConfig.setLanguage(languagePacks);
ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath());
parseContext.set(TesseractOCRConfig.class, ocrConfig); parseContext.set(TesseractOCRConfig.class, ocrConfig);
// Configure how Tika handles OCRing PDFs // Configure how Tika handles OCRing PDFs
@ -347,6 +344,16 @@ final class TikaTextExtractor implements TextExtractor {
future.cancel(true); future.cancel(true);
} }
} }
private TesseractOCRConfig getTesseractConfig() {
// GVDTODO look at this: https://tika.apache.org/3.0.0/configuring.html
// String tesseractFolder = TESSERACT_PATH.getParent();
// ocrConfig.setTesseractPath(tesseractFolder);
// ocrConfig.setLanguage(languagePacks);
// ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath());
return null;
}
/** /**
* Run OCR and return the file stream produced by Tesseract. * Run OCR and return the file stream produced by Tesseract.

View File

@ -405,6 +405,7 @@
<package>org.apache.commons.io</package> <package>org.apache.commons.io</package>
<package>org.apache.commons.io.comparator</package> <package>org.apache.commons.io.comparator</package>
<package>org.apache.commons.io.filefilter</package> <package>org.apache.commons.io.filefilter</package>
<package>org.apache.commons.io.function</package>
<package>org.apache.commons.io.input</package> <package>org.apache.commons.io.input</package>
<package>org.apache.commons.io.monitor</package> <package>org.apache.commons.io.monitor</package>
<package>org.apache.commons.io.output</package> <package>org.apache.commons.io.output</package>

View File

@ -4,5 +4,5 @@ file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
file.reference.mockito-core-4.8.1.jar=release/modules/ext/mockito-core-4.8.1.jar file.reference.mockito-core-4.8.1.jar=release/modules/ext/mockito-core-4.8.1.jar
file.reference.objenesis-3.4.jar=release/modules/ext/objenesis-3.4.jar file.reference.objenesis-3.4.jar=release/modules/ext/objenesis-3.4.jar
javac.source=11 javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial

View File

@ -22,7 +22,7 @@
<dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="9.12.1"/> <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.4"/> <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.4"/> <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.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"/> -->

View File

@ -1,48 +1,45 @@
file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar
file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.0.jar file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar
file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar
file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar file.reference.guava-16.0.1.jar=release/modules/ext/guava-16.0.1.jar
file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
file.reference.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar file.reference.http2-client-9.4.53.v20231009.jar=release/modules/ext/http2-client-9.4.53.v20231009.jar
file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar file.reference.http2-common-9.4.53.v20231009.jar=release/modules/ext/http2-common-9.4.53.v20231009.jar
file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.jar file.reference.http2-hpack-9.4.53.v20231009.jar=release/modules/ext/http2-hpack-9.4.53.v20231009.jar
file.reference.http2-http-client-transport-9.4.44.v20210927.jar=release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar file.reference.http2-http-client-transport-9.4.53.v20231009.jar=release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar
file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
file.reference.httpcore-4.4.14.jar=release/modules/ext/httpcore-4.4.14.jar file.reference.httpcore-4.4.14.jar=release/modules/ext/httpcore-4.4.14.jar
file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar
file.reference.icu4j-70.1.jar=release/modules/ext/icu4j-70.1.jar file.reference.icu4j-76.1.jar=release/modules/ext/icu4j-76.1.jar
file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar
file.reference.jetty-alpn-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar file.reference.jetty-alpn-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar
file.reference.jetty-alpn-java-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar file.reference.jetty-alpn-java-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar
file.reference.jetty-alpn-openjdk8-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar file.reference.jetty-client-9.4.53.v20231009.jar=release/modules/ext/jetty-client-9.4.53.v20231009.jar
file.reference.jetty-client-9.4.44.v20210927.jar=release/modules/ext/jetty-client-9.4.44.v20210927.jar file.reference.jetty-http-9.4.53.v20231009.jar=release/modules/ext/jetty-http-9.4.53.v20231009.jar
file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9.4.44.v20210927.jar file.reference.jetty-io-9.4.53.v20231009.jar=release/modules/ext/jetty-io-9.4.53.v20231009.jar
file.reference.jetty-io-9.4.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar file.reference.jetty-util-9.4.53.v20231009.jar=release/modules/ext/jetty-util-9.4.53.v20231009.jar
file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.jar
file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar
file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar
file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar file.reference.lucene-core-9.12.1.jar=release/modules/ext/lucene-core-9.12.1.jar
file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar file.reference.netty-buffer-4.1.99.Final.jar=release/modules/ext/netty-buffer-4.1.99.Final.jar
file.reference.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.2.jar file.reference.netty-codec-4.1.99.Final.jar=release/modules/ext/netty-codec-4.1.99.Final.jar
file.reference.netty-buffer-4.1.68.Final.jar=release/modules/ext/netty-buffer-4.1.68.Final.jar file.reference.netty-common-4.1.99.Final.jar=release/modules/ext/netty-common-4.1.99.Final.jar
file.reference.netty-codec-4.1.68.Final.jar=release/modules/ext/netty-codec-4.1.68.Final.jar file.reference.netty-handler-4.1.99.Final.jar=release/modules/ext/netty-handler-4.1.99.Final.jar
file.reference.netty-common-4.1.68.Final.jar=release/modules/ext/netty-common-4.1.68.Final.jar file.reference.netty-resolver-4.1.99.Final.jar=release/modules/ext/netty-resolver-4.1.99.Final.jar
file.reference.netty-handler-4.1.68.Final.jar=release/modules/ext/netty-handler-4.1.68.Final.jar file.reference.netty-transport-4.1.99.Final.jar=release/modules/ext/netty-transport-4.1.99.Final.jar
file.reference.netty-resolver-4.1.68.Final.jar=release/modules/ext/netty-resolver-4.1.68.Final.jar file.reference.netty-transport-classes-epoll-4.1.99.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.99.Final.jar
file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar file.reference.netty-transport-native-epoll-4.1.99.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.99.Final.jar
file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar file.reference.netty-transport-native-unix-common-4.1.99.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar
file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar
file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar
file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar
file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar file.reference.snappy-java-1.1.10.1.jar=release/modules/ext/snappy-java-1.1.10.1.jar
file.reference.solr-solrj-8.11.2.jar=release/modules/ext/solr-solrj-8.11.2.jar file.reference.solr-solrj-8.11.4.jar=release/modules/ext/solr-solrj-8.11.4.jar
file.reference.stax-api-1.0.1.jar=release/modules/ext/stax-api-1.0.1.jar
file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar
file.reference.woodstox-core-6.2.4.jar=release/modules/ext/woodstox-core-6.2.4.jar file.reference.woodstox-core-6.5.1.jar=release/modules/ext/woodstox-core-6.5.1.jar
file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.jar
file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar file.reference.zookeeper-jute-3.6.2.jar=release/modules/ext/zookeeper-jute-3.6.2.jar
javac.source=17 javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt license.file=../LICENSE-2.0.txt

View File

@ -239,8 +239,8 @@
<binary-origin>release/modules/ext/annotations-12.0.jar</binary-origin> <binary-origin>release/modules/ext/annotations-12.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/commons-io-2.8.0.jar</runtime-relative-path> <runtime-relative-path>ext/commons-io-2.11.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-io-2.8.0.jar</binary-origin> <binary-origin>release/modules/ext/commons-io-2.11.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path> <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
@ -251,28 +251,28 @@
<binary-origin>release/modules/ext/commons-math3-3.6.1.jar</binary-origin> <binary-origin>release/modules/ext/commons-math3-3.6.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path> <runtime-relative-path>ext/guava-16.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> <binary-origin>release/modules/ext/guava-16.0.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path> <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin> <binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/http2-client-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/http2-client-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/http2-client-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/http2-client-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/http2-common-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/http2-common-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/http2-common-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/http2-common-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/http2-hpack-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/http2-hpack-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/http2-hpack-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/http2-hpack-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/http2-http-client-transport-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/http2-http-client-transport-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path> <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
@ -287,40 +287,36 @@
<binary-origin>release/modules/ext/httpmime-4.5.13.jar</binary-origin> <binary-origin>release/modules/ext/httpmime-4.5.13.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/icu4j-70.1.jar</runtime-relative-path> <runtime-relative-path>ext/icu4j-76.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/icu4j-70.1.jar</binary-origin> <binary-origin>release/modules/ext/icu4j-76.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jcl-over-slf4j-1.7.24.jar</runtime-relative-path> <runtime-relative-path>ext/jcl-over-slf4j-1.7.36.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jcl-over-slf4j-1.7.24.jar</binary-origin> <binary-origin>release/modules/ext/jcl-over-slf4j-1.7.36.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-alpn-client-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-alpn-client-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-alpn-java-client-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-alpn-java-client-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-client-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-client-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-client-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-http-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-client-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-http-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-http-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-io-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-http-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-io-9.4.53.v20231009.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jetty-io-9.4.44.v20210927.jar</runtime-relative-path> <runtime-relative-path>ext/jetty-util-9.4.53.v20231009.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-io-9.4.44.v20210927.jar</binary-origin> <binary-origin>release/modules/ext/jetty-util-9.4.53.v20231009.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jetty-util-9.4.44.v20210927.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jetty-util-9.4.44.v20210927.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path> <runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path>
@ -335,84 +331,76 @@
<binary-origin>release/modules/ext/language-detector-0.6.jar</binary-origin> <binary-origin>release/modules/ext/language-detector-0.6.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/logback-classic-1.2.10.jar</runtime-relative-path> <runtime-relative-path>ext/lucene-core-9.12.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/logback-classic-1.2.10.jar</binary-origin> <binary-origin>release/modules/ext/lucene-core-9.12.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/logback-core-1.2.10.jar</runtime-relative-path> <runtime-relative-path>ext/netty-buffer-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/logback-core-1.2.10.jar</binary-origin> <binary-origin>release/modules/ext/netty-buffer-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/lucene-core-8.11.2.jar</runtime-relative-path> <runtime-relative-path>ext/netty-codec-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/lucene-core-8.11.2.jar</binary-origin> <binary-origin>release/modules/ext/netty-codec-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-buffer-4.1.68.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-common-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-buffer-4.1.68.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-common-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-codec-4.1.68.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-handler-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-codec-4.1.68.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-handler-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-common-4.1.68.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-resolver-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-common-4.1.68.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-resolver-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-handler-4.1.68.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-transport-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-handler-4.1.68.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-transport-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-resolver-4.1.68.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-resolver-4.1.68.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-tcnative-2.0.48.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-transport-native-epoll-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-tcnative-2.0.48.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.99.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/netty-tcnative-classes-2.0.48.Final.jar</runtime-relative-path> <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.99.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar</binary-origin> <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/netty-transport-4.1.68.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-transport-4.1.68.Final.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/netty-transport-native-epoll-4.1.68.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/netty-transport-native-unix-common-4.1.68.Final.jar</runtime-relative-path>
<binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> <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> <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/snappy-java-1.1.7.6.jar</runtime-relative-path> <runtime-relative-path>ext/snappy-java-1.1.10.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/snappy-java-1.1.7.6.jar</binary-origin> <binary-origin>release/modules/ext/snappy-java-1.1.10.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/solr-solrj-8.11.2.jar</runtime-relative-path> <runtime-relative-path>ext/solr-solrj-8.11.4.jar</runtime-relative-path>
<binary-origin>release/modules/ext/solr-solrj-8.11.2.jar</binary-origin> <binary-origin>release/modules/ext/solr-solrj-8.11.4.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/stax-api-1.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/stax-api-1.0.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/stax2-api-4.2.1.jar</runtime-relative-path> <runtime-relative-path>ext/stax2-api-4.2.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/stax2-api-4.2.1.jar</binary-origin> <binary-origin>release/modules/ext/stax2-api-4.2.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/woodstox-core-6.2.4.jar</runtime-relative-path> <runtime-relative-path>ext/woodstox-core-6.5.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/woodstox-core-6.2.4.jar</binary-origin> <binary-origin>release/modules/ext/woodstox-core-6.5.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/zookeeper-3.8.0.jar</runtime-relative-path> <runtime-relative-path>ext/zookeeper-3.6.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/zookeeper-3.8.0.jar</binary-origin> <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/zookeeper-jute-3.8.0.jar</runtime-relative-path> <runtime-relative-path>ext/zookeeper-jute-3.6.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/zookeeper-jute-3.8.0.jar</binary-origin> <binary-origin>release/modules/ext/zookeeper-jute-3.6.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
</data> </data>
</configuration> </configuration>

View File

@ -5,8 +5,11 @@
</configurations> </configurations>
<dependencies > <dependencies >
<dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="3.0.0"/> <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="3.0.0"/>
<dependency conf="tika->default" org="org.apache.tika" name="tika-core" 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"/>
<!-- https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
<!-- <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"/>

View File

@ -58,6 +58,7 @@ file.reference.rome-utils-2.1.0.jar=release/modules/ext/rome-utils-2.1.0.jar
file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar
file.reference.SparseBitSet-1.3.jar=release/modules/ext/SparseBitSet-1.3.jar file.reference.SparseBitSet-1.3.jar=release/modules/ext/SparseBitSet-1.3.jar
file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
file.reference.tika-core-3.0.0.jar=release/modules/ext/tika-core-3.0.0.jar
file.reference.tika-parser-apple-module-3.0.0.jar=release/modules/ext/tika-parser-apple-module-3.0.0.jar file.reference.tika-parser-apple-module-3.0.0.jar=release/modules/ext/tika-parser-apple-module-3.0.0.jar
file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar
file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar

View File

@ -595,6 +595,10 @@
<runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path> <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin> <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/tika-core-3.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/tika-core-3.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/tika-parser-apple-module-3.0.0.jar</runtime-relative-path> <runtime-relative-path>ext/tika-parser-apple-module-3.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/tika-parser-apple-module-3.0.0.jar</binary-origin> <binary-origin>release/modules/ext/tika-parser-apple-module-3.0.0.jar</binary-origin>