diff --git a/Core/ivy.xml b/Core/ivy.xml index 8a41fddea55dfbc74f3292c67d1bd34c22e63aa3..fba2d99acd3235b14e78018dd9e42d7ea5d8928a 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -24,7 +24,7 @@ <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.16.1"/> - <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.18"/> + <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.18.0"/> <dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/> <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.12.45" /> @@ -33,7 +33,7 @@ <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.3"/> <!-- for yaml reading/writing --> - <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2"/> + <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2.0"/> <!-- map support for geolocation --> <dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.6"/> @@ -67,7 +67,7 @@ <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="1.14"/> <!-- 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="3.1.0"/> + <dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/> <!-- annotations like guarded by --> <dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.6.0"/> @@ -77,7 +77,7 @@ <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="com.google.guava" module="guava" rev="32.0.1.jre"/> + <override org="com.google.guava" module="guava" rev="32.0.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 1ef54eac7f208d9e1756b980f956a106e9e50ac7..a24bcb423ed0d769482e9c0bda655ee94ad8745d 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -17,7 +17,7 @@ file.reference.bcprov-ext-jdk15on-1.70.jar=release/modules/ext/bcprov-ext-jdk15o file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar -file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar +file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar file.reference.commons-dbcp2-2.9.0.jar=release/modules/ext/commons-dbcp2-2.9.0.jar file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar file.reference.commons-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar @@ -28,13 +28,13 @@ file.reference.curator-framework-5.2.1.jar=release/modules/ext/curator-framework file.reference.curator-recipes-5.2.1.jar=release/modules/ext/curator-recipes-5.2.1.jar file.reference.DatCon.jar=release/modules/ext/DatCon.jar file.reference.decodetect-core-0.3.jar=release/modules/ext/decodetect-core-0.3.jar -file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar +file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar -file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar 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.istack-commons-runtime-3.0.11.jar=release/modules/ext/istack-commons-runtime-3.0.11.jar -file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.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.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar @@ -49,7 +49,7 @@ file.reference.jaxb-runtime-2.3.3.jar=release/modules/ext/jaxb-runtime-2.3.3.jar file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar file.reference.jfreechart-1.5.3.jar=release/modules/ext/jfreechart-1.5.3.jar file.reference.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar -file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.jar +file.reference.jsoup-1.16.1.jar=release/modules/ext/jsoup-1.16.1.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar file.reference.jutf7-1.0.0.jar=release/modules/ext/jutf7-1.0.0.jar file.reference.jxmapviewer2-2.6.jar=release/modules/ext/jxmapviewer2-2.6.jar @@ -59,7 +59,7 @@ file.reference.listenablefuture-1.0.jar=release/modules/ext/listenablefuture-1.0 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.mchange-commons-java-0.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.jar -file.reference.metadata-extractor-2.17.0.jar=release/modules/ext/metadata-extractor-2.17.0.jar +file.reference.metadata-extractor-2.18.0.jar=release/modules/ext/metadata-extractor-2.18.0.jar file.reference.netty-buffer-4.1.73.Final.jar=release/modules/ext/netty-buffer-4.1.73.Final.jar file.reference.netty-codec-4.1.73.Final.jar=release/modules/ext/netty-codec-4.1.73.Final.jar file.reference.netty-common-4.1.73.Final.jar=release/modules/ext/netty-common-4.1.73.Final.jar @@ -80,7 +80,8 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.12.0.jar=release/modules/ext/sleuthkit-4.12.0.jar file.reference.sleuthkit-caseuco-4.12.0.jar=release/modules/ext/sleuthkit-caseuco-4.12.0.jar -file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar +file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.jar file.reference.sqlite-jdbc-3.42.0.0.jar=release/modules/ext/sqlite-jdbc-3.42.0.0.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 97a3e8b00a39b686921674bce013bf3e05dce8a9..0553a915ca279a4833b7f03ebad6378ceb400f11 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -445,8 +445,8 @@ <binary-origin>release/modules/ext/c3p0-0.9.5.5.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/checker-qual-3.12.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/checker-qual-3.12.0.jar</binary-origin> + <runtime-relative-path>ext/checker-qual-3.33.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/checker-qual-3.33.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/commons-dbcp2-2.9.0.jar</runtime-relative-path> @@ -489,16 +489,16 @@ <binary-origin>release/modules/ext/decodetect-core-0.3.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/error_prone_annotations-2.11.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/error_prone_annotations-2.11.0.jar</binary-origin> + <runtime-relative-path>ext/error_prone_annotations-2.18.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/error_prone_annotations-2.18.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path> <binary-origin>release/modules/ext/failureaccess-1.0.1.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path> - <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> + <runtime-relative-path>ext/guava-32.0.1-jre.jar</runtime-relative-path> + <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/icepdf-core-6.2.2.jar</runtime-relative-path> @@ -513,8 +513,8 @@ <binary-origin>release/modules/ext/istack-commons-runtime-3.0.11.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin> + <runtime-relative-path>ext/j2objc-annotations-2.8.jar</runtime-relative-path> + <binary-origin>release/modules/ext/j2objc-annotations-2.8.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jackcess-4.0.1.jar</runtime-relative-path> @@ -573,8 +573,8 @@ <binary-origin>release/modules/ext/jgraphx-4.2.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jsoup-1.14.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jsoup-1.14.3.jar</binary-origin> + <runtime-relative-path>ext/jsoup-1.16.1.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jsoup-1.16.1.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path> @@ -613,8 +613,8 @@ <binary-origin>release/modules/ext/mchange-commons-java-0.2.20.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/metadata-extractor-2.17.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/metadata-extractor-2.17.0.jar</binary-origin> + <runtime-relative-path>ext/metadata-extractor-2.18.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/metadata-extractor-2.18.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/netty-buffer-4.1.73.Final.jar</runtime-relative-path> @@ -697,8 +697,12 @@ <binary-origin>release/modules/ext/sleuthkit-caseuco-4.12.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/snakeyaml-1.30.jar</runtime-relative-path> - <binary-origin>release/modules/ext/snakeyaml-1.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-2.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/snakeyaml-2.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path> diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index b9d1905bf65f101622fd5a2d823f2b747649410a..2c62226fb1beaf83f6a43960084a25151e114ce8 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -94,7 +94,7 @@ <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="32.0.1.jre"/> + <override org="com.google.guava" module="guava" rev="32.0.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 6a6ace636185734995875aea2031f79c7dce7d75..99459711d8ada9d31f9ed2246f8cf4c82ecd5018 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -22,7 +22,7 @@ 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-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar -file.reference.commons-text-1.9.jar=release/modules/ext/commons-text-1.9.jar +file.reference.commons-text-1.10.0.jar=release/modules/ext/commons-text-1.10.0.jar file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar @@ -60,7 +60,7 @@ file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar file.reference.grpc-xds-1.44.1.jar=release/modules/ext/grpc-xds-1.44.1.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.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.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 @@ -79,10 +79,10 @@ 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-annotations-2.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.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.jackson-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar +file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar +file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar +file.reference.jackson-dataformat-csv-2.15.2.jar=release/modules/ext/jackson-dataformat-csv-2.15.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-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 39c4e8786ba93a673864c1bae4e84fa793d2c4f5..9c74f6c00524956ff7b0a04644eb3a9d2b5c7a59 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -471,7 +471,7 @@ <package>org.slf4j.helpers</package> <package>org.slf4j.spi</package> </public-packages> - <class-path-extension> + <class-path-extension> <runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path> <binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin> </class-path-extension> @@ -568,8 +568,8 @@ <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/commons-text-1.9.jar</runtime-relative-path> - <binary-origin>release/modules/ext/commons-text-1.9.jar</binary-origin> + <runtime-relative-path>ext/commons-text-1.10.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/commons-text-1.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/commons-validator-1.7.jar</runtime-relative-path> @@ -720,8 +720,8 @@ <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.1-jre.jar</runtime-relative-path> - <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> + <runtime-relative-path>ext/guava-32.0.1-jre.jar</runtime-relative-path> + <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path> @@ -796,20 +796,20 @@ <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-annotations-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-annotations-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-core-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-databind-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-databind-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-dataformat-csv-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-dataformat-csv-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path> diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 639894fee3de216c50b214ca4da1ed1c9969dff3..baa7a10c98634da5633e610d1110948628aab807 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -1,10 +1,7 @@ file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar -file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.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.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar -file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.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 @@ -15,7 +12,6 @@ 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.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.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 @@ -25,12 +21,11 @@ file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9. 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.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar -file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.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.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar file.reference.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 @@ -48,7 +43,6 @@ 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.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.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 b1ec158a2ae07bc30a20e272846b2e73bf33364b..c1048f48ee89c9df1b1c0d9a225a017a7ff5d8eb 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -238,10 +238,6 @@ <runtime-relative-path>ext/annotations-12.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/annotations-12.0.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/checker-qual-3.12.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/checker-qual-3.12.0.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/commons-io-2.8.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/commons-io-2.8.0.jar</binary-origin> @@ -254,14 +250,6 @@ <runtime-relative-path>ext/commons-math3-3.6.1.jar</runtime-relative-path> <binary-origin>release/modules/ext/commons-math3-3.6.1.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/error_prone_annotations-2.11.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/error_prone_annotations-2.11.0.jar</binary-origin> - </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path> - <binary-origin>release/modules/ext/failureaccess-1.0.1.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path> <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> @@ -302,10 +290,6 @@ <runtime-relative-path>ext/icu4j-70.1.jar</runtime-relative-path> <binary-origin>release/modules/ext/icu4j-70.1.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jcl-over-slf4j-1.7.24.jar</runtime-relative-path> <binary-origin>release/modules/ext/jcl-over-slf4j-1.7.24.jar</binary-origin> @@ -342,10 +326,6 @@ <runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path> <binary-origin>release/modules/ext/jsonic-1.2.11.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jsr305-3.0.2.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/junit-4.13.2.jar</runtime-relative-path> <binary-origin>release/modules/ext/junit-4.13.2.jar</binary-origin> @@ -354,10 +334,6 @@ <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path> <binary-origin>release/modules/ext/language-detector-0.6.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</runtime-relative-path> - <binary-origin>release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/logback-classic-1.2.10.jar</runtime-relative-path> <binary-origin>release/modules/ext/logback-classic-1.2.10.jar</binary-origin> @@ -366,6 +342,10 @@ <runtime-relative-path>ext/logback-core-1.2.10.jar</runtime-relative-path> <binary-origin>release/modules/ext/logback-core-1.2.10.jar</binary-origin> </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/lucene-core-8.11.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/lucene-core-8.11.2.jar</binary-origin> + </class-path-extension> <class-path-extension> <runtime-relative-path>ext/netty-buffer-4.1.68.Final.jar</runtime-relative-path> <binary-origin>release/modules/ext/netty-buffer-4.1.68.Final.jar</binary-origin> @@ -434,10 +414,6 @@ <runtime-relative-path>ext/zookeeper-jute-3.8.0.jar</runtime-relative-path> <binary-origin>release/modules/ext/zookeeper-jute-3.8.0.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/lucene-core-8.11.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/lucene-core-8.11.2.jar</binary-origin> - </class-path-extension> </data> </configuration> </project> diff --git a/Tika/ivy.xml b/Tika/ivy.xml index bf8c85435aa52dd751325d44a02072aea53c598a..62b93e7caefd1beab6f19833200086bfdc27c78a 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -11,7 +11,7 @@ <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="32.0.1.jre"/> + <override org="com.google.guava" module="guava" rev="32.0.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/> <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/> diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index 927ba0e0ef908a2ce04fb2d05d4c8862f7b128a5..2ebead2a20bfd6d688c2ce92d1676cbef177826f 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -9,7 +9,7 @@ file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar -file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar +file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.jar file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar file.reference.commons-compress-1.21.jar=release/modules/ext/commons-compress-1.21.jar @@ -28,13 +28,13 @@ file.reference.cxf-rt-transports-http-3.5.0.jar=release/modules/ext/cxf-rt-trans file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar file.reference.dec-0.1.2.jar=release/modules/ext/dec-0.1.2.jar file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar -file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar +file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar file.reference.fontbox-2.0.25.jar=release/modules/ext/fontbox-2.0.25.jar file.reference.geoapi-3.0.1.jar=release/modules/ext/geoapi-3.0.1.jar file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar -file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar file.reference.HikariCP-java7-2.4.13.jar=release/modules/ext/HikariCP-java7-2.4.13.jar file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar file.reference.httpcore-4.4.13.jar=release/modules/ext/httpcore-4.4.13.jar @@ -42,12 +42,12 @@ file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar file.reference.isoparser-1.9.41.7.jar=release/modules/ext/isoparser-1.9.41.7.jar file.reference.istack-commons-runtime-3.0.12.jar=release/modules/ext/istack-commons-runtime-3.0.12.jar -file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.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.2.jar=release/modules/ext/jackson-annotations-2.13.2.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-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar +file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar +file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar file.reference.jai-imageio-core-1.4.0.jar=release/modules/ext/jai-imageio-core-1.4.0.jar file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar file.reference.jakarta.activation-api-1.2.2.jar=release/modules/ext/jakarta.activation-api-1.2.2.jar diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index 9dc448105e1a73d2e82f446de72ae972032568c5..c103d1a1c6d8bc2d2b5d895a2635e0d201eb0bd9 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -400,8 +400,8 @@ <binary-origin>release/modules/ext/cdm-4.5.5.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/checker-qual-3.12.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/checker-qual-3.12.0.jar</binary-origin> + <runtime-relative-path>ext/checker-qual-3.33.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/checker-qual-3.33.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/commons-codec-1.15.jar</runtime-relative-path> @@ -476,8 +476,8 @@ <binary-origin>release/modules/ext/ehcache-core-2.6.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/error_prone_annotations-2.11.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/error_prone_annotations-2.11.0.jar</binary-origin> + <runtime-relative-path>ext/error_prone_annotations-2.18.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/error_prone_annotations-2.18.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path> @@ -500,8 +500,8 @@ <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path> - <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin> + <runtime-relative-path>ext/guava-32.0.1-jre.jar</runtime-relative-path> + <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/HikariCP-java7-2.4.13.jar</runtime-relative-path> @@ -532,8 +532,8 @@ <binary-origin>release/modules/ext/istack-commons-runtime-3.0.12.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin> + <runtime-relative-path>ext/j2objc-annotations-2.8.jar</runtime-relative-path> + <binary-origin>release/modules/ext/j2objc-annotations-2.8.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jackcess-4.0.1.jar</runtime-relative-path> @@ -544,16 +544,16 @@ <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.2.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin> + <runtime-relative-path>ext/jackson-annotations-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-annotations-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-core-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-databind-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-databind-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jai-imageio-core-1.4.0.jar</runtime-relative-path> diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties index 0c973f2af0d84f63af3a706915f8ef66e7ecd520..8d13059ed61c4f5369e87cf29387a1e7fd20aa08 100644 --- a/thunderbirdparser/nbproject/project.properties +++ b/thunderbirdparser/nbproject/project.properties @@ -1,9 +1,9 @@ file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.jar file.reference.freemarker-2.3.31.jar=release/modules/ext/freemarker-2.3.31.jar -file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar +file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar -file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.jar +file.reference.jsoup-1.16.1.jar=release/modules/ext/jsoup-1.16.1.jar file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar javac.source=17 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml index 269ee0eae61b4a0515b65cca8478b35a4a8dc7b3..5c4fa0e042b6df43ecc8660dda35661fd9c2fe13 100644 --- a/thunderbirdparser/nbproject/project.xml +++ b/thunderbirdparser/nbproject/project.xml @@ -90,16 +90,16 @@ <binary-origin>release/modules/ext/freemarker-2.3.31.jar</binary-origin> </class-path-extension> <class-path-extension> - <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> + <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jackson-core-2.15.2.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/java-libpst-0.9.5-SNAPSHOT.jar</runtime-relative-path> <binary-origin>release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jsoup-1.14.3.jar</runtime-relative-path> - <binary-origin>release/modules/ext/jsoup-1.14.3.jar</binary-origin> + <runtime-relative-path>ext/jsoup-1.16.1.jar</runtime-relative-path> + <binary-origin>release/modules/ext/jsoup-1.16.1.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/vinnie-2.0.2.jar</runtime-relative-path>