diff --git a/Core/ivy.xml b/Core/ivy.xml index fab897b728..274d2620ca 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -7,6 +7,7 @@ + diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 6dff2bc257..c59b4438b9 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -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.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.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.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 diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index deb06cbb28..c1f7418b98 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -565,6 +565,18 @@ ext/jakarta.annotation-api-2.1.1.jar release/modules/ext/jakarta.annotation-api-2.1.1.jar + + ext/jakarta.jms-api-3.1.0-javadoc.jar + release/modules/ext/jakarta.jms-api-3.1.0-javadoc.jar + + + ext/jakarta.jms-api-3.1.0-sources.jar + release/modules/ext/jakarta.jms-api-3.1.0-sources.jar + + + ext/jakarta.jms-api-3.1.0.jar + release/modules/ext/jakarta.jms-api-3.1.0.jar + ext/jakarta.transaction-api-1.3.3.jar release/modules/ext/jakarta.transaction-api-1.3.3.jar diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java index f3fb273bcf..1beac1f4a0 100644 --- a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java +++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.logging.Level; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.sleuthkit.autopsy.core.UserPreferencesException; import org.sleuthkit.autopsy.core.UserPreferences; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java index f7cf28096d..c2610eb3f7 100644 --- a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java +++ b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java @@ -21,8 +21,8 @@ package org.sleuthkit.autopsy.events; import java.net.URI; import java.net.URISyntaxException; import javax.annotation.concurrent.Immutable; -import javax.jms.Connection; -import javax.jms.JMSException; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java index a301e86010..69948ddbe1 100644 --- a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java +++ b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java @@ -22,16 +22,16 @@ import java.net.URISyntaxException; import java.util.logging.Level; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.Topic; +import jakarta.jms.Connection; +import jakarta.jms.DeliveryMode; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java index e9276a81b7..82e58d381d 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java @@ -50,6 +50,7 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MimeTypeException; import org.apache.tika.parser.AutoDetectParser; @@ -728,7 +729,7 @@ class DocumentEmbeddedContentExtractor { } // 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 // above. The 1.16 version of Tika keeps track of files that diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java index d898aaa1ca..78ba3a4fbd 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java @@ -30,6 +30,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; 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. 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); //Append the extension if we can. diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java index 8a40bf339d..e81f069f62 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.logging.Level; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; @@ -287,7 +288,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter bin = new BufferedInputStream(in); ContentHandler handler = new BodyContentHandler(-1); Metadata metadata = new Metadata(); - metadata.add(Metadata.RESOURCE_NAME_KEY, file.getName()); + metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, file.getName()); AutoDetectParser parser = new AutoDetectParser(); parser.parse(bin, handler, metadata, new ParseContext()); } catch (EncryptedDocumentException ex) { diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java index 788ca39575..0d7d4b9a0f 100644 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java @@ -75,6 +75,7 @@ import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Set; +import org.apache.tika.config.TikaConfig; import org.apache.tika.mime.MimeTypes; import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY; import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator; @@ -282,11 +283,7 @@ final class TikaTextExtractor implements TextExtractor { if (isOcrSupported()) { // Configure OCR for Tika if it chooses to run OCR // during extraction - TesseractOCRConfig ocrConfig = new TesseractOCRConfig(); - String tesseractFolder = TESSERACT_PATH.getParent(); - ocrConfig.setTesseractPath(tesseractFolder); - ocrConfig.setLanguage(languagePacks); - ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath()); + TesseractOCRConfig ocrConfig = getTesseractConfig(); parseContext.set(TesseractOCRConfig.class, ocrConfig); // Configure how Tika handles OCRing PDFs @@ -347,6 +344,16 @@ final class TikaTextExtractor implements TextExtractor { 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. diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index d510eb748e..0b2daee78f 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -405,6 +405,7 @@ org.apache.commons.io org.apache.commons.io.comparator org.apache.commons.io.filefilter + org.apache.commons.io.function org.apache.commons.io.input org.apache.commons.io.monitor org.apache.commons.io.output diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties index fed65b4808..5830504c3e 100644 --- a/CoreTestLibs/nbproject/project.properties +++ b/CoreTestLibs/nbproject/project.properties @@ -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.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 -javac.source=11 +javac.source=17 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index eb3c42ba71..5a29483948 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -22,7 +22,7 @@ - + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 16289e9e73..cbf856e56d 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -1,48 +1,45 @@ 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-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.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar -file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar -file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.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-client-9.4.53.v20231009.jar=release/modules/ext/http2-client-9.4.53.v20231009.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.53.v20231009.jar=release/modules/ext/http2-hpack-9.4.53.v20231009.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.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.icu4j-70.1.jar=release/modules/ext/icu4j-70.1.jar -file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.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-java-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.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.44.v20210927.jar=release/modules/ext/jetty-client-9.4.44.v20210927.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.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar -file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.jar +file.reference.icu4j-76.1.jar=release/modules/ext/icu4j-76.1.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.53.v20231009.jar=release/modules/ext/jetty-alpn-client-9.4.53.v20231009.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-client-9.4.53.v20231009.jar=release/modules/ext/jetty-client-9.4.53.v20231009.jar +file.reference.jetty-http-9.4.53.v20231009.jar=release/modules/ext/jetty-http-9.4.53.v20231009.jar +file.reference.jetty-io-9.4.53.v20231009.jar=release/modules/ext/jetty-io-9.4.53.v20231009.jar +file.reference.jetty-util-9.4.53.v20231009.jar=release/modules/ext/jetty-util-9.4.53.v20231009.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.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.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar -file.reference.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.2.jar -file.reference.netty-buffer-4.1.68.Final.jar=release/modules/ext/netty-buffer-4.1.68.Final.jar -file.reference.netty-codec-4.1.68.Final.jar=release/modules/ext/netty-codec-4.1.68.Final.jar -file.reference.netty-common-4.1.68.Final.jar=release/modules/ext/netty-common-4.1.68.Final.jar -file.reference.netty-handler-4.1.68.Final.jar=release/modules/ext/netty-handler-4.1.68.Final.jar -file.reference.netty-resolver-4.1.68.Final.jar=release/modules/ext/netty-resolver-4.1.68.Final.jar -file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.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-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.lucene-core-9.12.1.jar=release/modules/ext/lucene-core-9.12.1.jar +file.reference.netty-buffer-4.1.99.Final.jar=release/modules/ext/netty-buffer-4.1.99.Final.jar +file.reference.netty-codec-4.1.99.Final.jar=release/modules/ext/netty-codec-4.1.99.Final.jar +file.reference.netty-common-4.1.99.Final.jar=release/modules/ext/netty-common-4.1.99.Final.jar +file.reference.netty-handler-4.1.99.Final.jar=release/modules/ext/netty-handler-4.1.99.Final.jar +file.reference.netty-resolver-4.1.99.Final.jar=release/modules/ext/netty-resolver-4.1.99.Final.jar +file.reference.netty-transport-4.1.99.Final.jar=release/modules/ext/netty-transport-4.1.99.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-transport-native-epoll-4.1.99.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.99.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.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.solr-solrj-8.11.2.jar=release/modules/ext/solr-solrj-8.11.2.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.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.woodstox-core-6.2.4.jar=release/modules/ext/woodstox-core-6.2.4.jar -file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar -file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar +file.reference.woodstox-core-6.5.1.jar=release/modules/ext/woodstox-core-6.5.1.jar +file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.jar +file.reference.zookeeper-jute-3.6.2.jar=release/modules/ext/zookeeper-jute-3.6.2.jar javac.source=17 javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 98a84faeb5..40466c4b5f 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -239,8 +239,8 @@ release/modules/ext/annotations-12.0.jar - ext/commons-io-2.8.0.jar - release/modules/ext/commons-io-2.8.0.jar + ext/commons-io-2.11.0.jar + release/modules/ext/commons-io-2.11.0.jar ext/commons-lang-2.6.jar @@ -251,28 +251,28 @@ release/modules/ext/commons-math3-3.6.1.jar - ext/guava-31.1-jre.jar - release/modules/ext/guava-31.1-jre.jar + ext/guava-16.0.1.jar + release/modules/ext/guava-16.0.1.jar ext/hamcrest-core-1.3.jar release/modules/ext/hamcrest-core-1.3.jar - ext/http2-client-9.4.44.v20210927.jar - release/modules/ext/http2-client-9.4.44.v20210927.jar + ext/http2-client-9.4.53.v20231009.jar + release/modules/ext/http2-client-9.4.53.v20231009.jar - ext/http2-common-9.4.44.v20210927.jar - release/modules/ext/http2-common-9.4.44.v20210927.jar + ext/http2-common-9.4.53.v20231009.jar + release/modules/ext/http2-common-9.4.53.v20231009.jar - ext/http2-hpack-9.4.44.v20210927.jar - release/modules/ext/http2-hpack-9.4.44.v20210927.jar + ext/http2-hpack-9.4.53.v20231009.jar + release/modules/ext/http2-hpack-9.4.53.v20231009.jar - ext/http2-http-client-transport-9.4.44.v20210927.jar - release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar + ext/http2-http-client-transport-9.4.53.v20231009.jar + release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar ext/httpclient-4.5.13.jar @@ -287,40 +287,36 @@ release/modules/ext/httpmime-4.5.13.jar - ext/icu4j-70.1.jar - release/modules/ext/icu4j-70.1.jar + ext/icu4j-76.1.jar + release/modules/ext/icu4j-76.1.jar - ext/jcl-over-slf4j-1.7.24.jar - release/modules/ext/jcl-over-slf4j-1.7.24.jar + ext/jcl-over-slf4j-1.7.36.jar + release/modules/ext/jcl-over-slf4j-1.7.36.jar - ext/jetty-alpn-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar + ext/jetty-alpn-client-9.4.53.v20231009.jar + release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar - ext/jetty-alpn-java-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar + ext/jetty-alpn-java-client-9.4.53.v20231009.jar + release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar - ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar + ext/jetty-client-9.4.53.v20231009.jar + release/modules/ext/jetty-client-9.4.53.v20231009.jar - ext/jetty-client-9.4.44.v20210927.jar - release/modules/ext/jetty-client-9.4.44.v20210927.jar + ext/jetty-http-9.4.53.v20231009.jar + release/modules/ext/jetty-http-9.4.53.v20231009.jar - ext/jetty-http-9.4.44.v20210927.jar - release/modules/ext/jetty-http-9.4.44.v20210927.jar + ext/jetty-io-9.4.53.v20231009.jar + release/modules/ext/jetty-io-9.4.53.v20231009.jar - ext/jetty-io-9.4.44.v20210927.jar - release/modules/ext/jetty-io-9.4.44.v20210927.jar - - - ext/jetty-util-9.4.44.v20210927.jar - release/modules/ext/jetty-util-9.4.44.v20210927.jar + ext/jetty-util-9.4.53.v20231009.jar + release/modules/ext/jetty-util-9.4.53.v20231009.jar ext/jsonic-1.2.11.jar @@ -335,84 +331,76 @@ release/modules/ext/language-detector-0.6.jar - ext/logback-classic-1.2.10.jar - release/modules/ext/logback-classic-1.2.10.jar + ext/lucene-core-9.12.1.jar + release/modules/ext/lucene-core-9.12.1.jar - ext/logback-core-1.2.10.jar - release/modules/ext/logback-core-1.2.10.jar + ext/netty-buffer-4.1.99.Final.jar + release/modules/ext/netty-buffer-4.1.99.Final.jar - ext/lucene-core-8.11.2.jar - release/modules/ext/lucene-core-8.11.2.jar + ext/netty-codec-4.1.99.Final.jar + release/modules/ext/netty-codec-4.1.99.Final.jar - ext/netty-buffer-4.1.68.Final.jar - release/modules/ext/netty-buffer-4.1.68.Final.jar + ext/netty-common-4.1.99.Final.jar + release/modules/ext/netty-common-4.1.99.Final.jar - ext/netty-codec-4.1.68.Final.jar - release/modules/ext/netty-codec-4.1.68.Final.jar + ext/netty-handler-4.1.99.Final.jar + release/modules/ext/netty-handler-4.1.99.Final.jar - ext/netty-common-4.1.68.Final.jar - release/modules/ext/netty-common-4.1.68.Final.jar + ext/netty-resolver-4.1.99.Final.jar + release/modules/ext/netty-resolver-4.1.99.Final.jar - ext/netty-handler-4.1.68.Final.jar - release/modules/ext/netty-handler-4.1.68.Final.jar + ext/netty-transport-4.1.99.Final.jar + release/modules/ext/netty-transport-4.1.99.Final.jar - ext/netty-resolver-4.1.68.Final.jar - release/modules/ext/netty-resolver-4.1.68.Final.jar + ext/netty-transport-classes-epoll-4.1.99.Final.jar + release/modules/ext/netty-transport-classes-epoll-4.1.99.Final.jar - ext/netty-tcnative-2.0.48.Final.jar - release/modules/ext/netty-tcnative-2.0.48.Final.jar + ext/netty-transport-native-epoll-4.1.99.Final.jar + release/modules/ext/netty-transport-native-epoll-4.1.99.Final.jar - ext/netty-tcnative-classes-2.0.48.Final.jar - release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar - - - ext/netty-transport-4.1.68.Final.jar - release/modules/ext/netty-transport-4.1.68.Final.jar - - - ext/netty-transport-native-epoll-4.1.68.Final.jar - release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar - - - ext/netty-transport-native-unix-common-4.1.68.Final.jar - release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar + ext/netty-transport-native-unix-common-4.1.99.Final.jar + release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar ext/slf4j-api-1.7.36.jar release/modules/ext/slf4j-api-1.7.36.jar - ext/snappy-java-1.1.7.6.jar - release/modules/ext/snappy-java-1.1.7.6.jar + ext/snappy-java-1.1.10.1.jar + release/modules/ext/snappy-java-1.1.10.1.jar - ext/solr-solrj-8.11.2.jar - release/modules/ext/solr-solrj-8.11.2.jar + ext/solr-solrj-8.11.4.jar + release/modules/ext/solr-solrj-8.11.4.jar + + + ext/stax-api-1.0.1.jar + release/modules/ext/stax-api-1.0.1.jar ext/stax2-api-4.2.1.jar release/modules/ext/stax2-api-4.2.1.jar - ext/woodstox-core-6.2.4.jar - release/modules/ext/woodstox-core-6.2.4.jar + ext/woodstox-core-6.5.1.jar + release/modules/ext/woodstox-core-6.5.1.jar - ext/zookeeper-3.8.0.jar - release/modules/ext/zookeeper-3.8.0.jar + ext/zookeeper-3.6.2.jar + release/modules/ext/zookeeper-3.6.2.jar - ext/zookeeper-jute-3.8.0.jar - release/modules/ext/zookeeper-jute-3.8.0.jar + ext/zookeeper-jute-3.6.2.jar + release/modules/ext/zookeeper-jute-3.6.2.jar diff --git a/Tika/ivy.xml b/Tika/ivy.xml index aae3f2492b..a2d663e9c2 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -5,8 +5,11 @@ + + - + +