Skip to content

Bump Tika and common dependencies throughout project #7979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Bump Tika and common dependencies throughout project #7979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
<property environment="env"/>
<copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-${TSK_VERSION}.jar"
tofile="${ext.dir}/sleuthkit-${TSK_VERSION}.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.49.1.0.jar"
tofile="${ext.dir}/sqlite-jdbc-3.49.1.0.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.50.3.0.jar"
tofile="${ext.dir}/sqlite-jdbc-3.50.3.0.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-42.7.5.jar"
tofile="${ext.dir}/postgresql-42.7.5.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.10.2.jar"
Expand Down
8 changes: 4 additions & 4 deletions Core/ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
<dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.9.3"/>

<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.7"/>
<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.2"/>
<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.8"/>
<dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.3"/>

<dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.13.0"/>

<dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.18.3"/>
<dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.21.2"/>

<dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0"/>
<dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/>
Expand Down Expand Up @@ -98,7 +98,7 @@
<override org="xerces" module="xercesImpl" rev="2.12.2"/>
<override org="org.bouncycastle" module="bcprov-jdk18on" rev="${bouncycastle.version}"/>
<override org="org.bouncycastle" module="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
<override org="commons-io" module="commons-io" rev="2.18.0"/>
<override org="commons-io" module="commons-io" rev="2.20.0"/>
<override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
<override org="io.netty" module="netty-transport" rev="${netty.version}"/>
<override org="io.netty" module="netty-transport-native-epoll" rev="${netty.version}"/>
Expand Down
2 changes: 1 addition & 1 deletion Core/ivysettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<property name="httpcomponents.version" value="4.5.14"/>
<property name="curator.version" value="5.7.1"/>
<property name="batik.version" value="1.18"/>
<property name="bouncycastle.version" value="1.79"/>
<property name="bouncycastle.version" value="1.81"/>
<property name="netty.version" value="4.1.116.Final"/>

<settings defaultResolver="main"/>
Expand Down
42 changes: 21 additions & 21 deletions Core/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ file.reference.activemq-all-6.1.4.jar=release/modules/ext/activemq-all-6.1.4.jar
file.reference.angus-activation-2.0.2.jar=release/modules/ext/angus-activation-2.0.2.jar
file.reference.annotations-13.0.jar=release/modules/ext/annotations-13.0.jar
file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar
file.reference.batik-awt-util-1.18.jar=release/modules/ext/batik-awt-util-1.18.jar
file.reference.batik-constants-1.18.jar=release/modules/ext/batik-constants-1.18.jar
file.reference.batik-css-1.18.jar=release/modules/ext/batik-css-1.18.jar
file.reference.batik-dom-1.18.jar=release/modules/ext/batik-dom-1.18.jar
file.reference.batik-ext-1.18.jar=release/modules/ext/batik-ext-1.18.jar
file.reference.batik-i18n-1.18.jar=release/modules/ext/batik-i18n-1.18.jar
file.reference.batik-parser-1.18.jar=release/modules/ext/batik-parser-1.18.jar
file.reference.batik-shared-resources-1.18.jar=release/modules/ext/batik-shared-resources-1.18.jar
file.reference.batik-svg-dom-1.18.jar=release/modules/ext/batik-svg-dom-1.18.jar
file.reference.batik-svggen-1.18.jar=release/modules/ext/batik-svggen-1.18.jar
file.reference.batik-util-1.18.jar=release/modules/ext/batik-util-1.18.jar
file.reference.batik-xml-1.18.jar=release/modules/ext/batik-xml-1.18.jar
file.reference.bcpkix-jdk18on-1.79.jar=release/modules/ext/bcpkix-jdk18on-1.79.jar
file.reference.bcprov-jdk18on-1.79.jar=release/modules/ext/bcprov-jdk18on-1.79.jar
file.reference.bcutil-jdk18on-1.79.jar=release/modules/ext/bcutil-jdk18on-1.79.jar
file.reference.batik-awt-util-1.19.jar=release/modules/ext/batik-awt-util-1.19.jar
file.reference.batik-constants-1.19.jar=release/modules/ext/batik-constants-1.19.jar
file.reference.batik-css-1.19.jar=release/modules/ext/batik-css-1.19.jar
file.reference.batik-dom-1.19.jar=release/modules/ext/batik-dom-1.19.jar
file.reference.batik-ext-1.19.jar=release/modules/ext/batik-ext-1.19.jar
file.reference.batik-i18n-1.19.jar=release/modules/ext/batik-i18n-1.19.jar
file.reference.batik-parser-1.19.jar=release/modules/ext/batik-parser-1.19.jar
file.reference.batik-shared-resources-1.19.jar=release/modules/ext/batik-shared-resources-1.19.jar
file.reference.batik-svg-dom-1.19.jar=release/modules/ext/batik-svg-dom-1.19.jar
file.reference.batik-svggen-1.19.jar=release/modules/ext/batik-svggen-1.19.jar
file.reference.batik-util-1.19.jar=release/modules/ext/batik-util-1.19.jar
file.reference.batik-xml-1.19.jar=release/modules/ext/batik-xml-1.19.jar
file.reference.bcpkix-jdk18on-1.81.jar=release/modules/ext/bcpkix-jdk18on-1.81.jar
file.reference.bcprov-jdk18on-1.81.jar=release/modules/ext/bcprov-jdk18on-1.81.jar
file.reference.bcutil-jdk18on-1.81.jar=release/modules/ext/bcutil-jdk18on-1.81.jar
file.reference.c3p0-0.10.2.jar=release/modules/ext/c3p0-0.10.2.jar
file.reference.checker-qual-3.43.0.jar=release/modules/ext/checker-qual-3.43.0.jar
file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
file.reference.commons-codec-1.19.0jar=release/modules/ext/commons-codec-1.19.0jar
file.reference.commons-dbcp2-2.13.0.jar=release/modules/ext/commons-dbcp2-2.13.0.jar
file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar
file.reference.commons-io-2.20.0.jar=release/modules/ext/commons-io-2.20.0.jar
file.reference.commons-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar
file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar
file.reference.commons-pool2-2.12.0.jar=release/modules/ext/commons-pool2-2.12.0.jar
Expand All @@ -43,8 +43,8 @@ file.reference.httpmime-4.5.14.jar=release/modules/ext/httpmime-4.5.14.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.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar
file.reference.jackcess-4.0.7.jar=release/modules/ext/jackcess-4.0.7.jar
file.reference.jackcess-encrypt-4.0.2.jar=release/modules/ext/jackcess-encrypt-4.0.2.jar
file.reference.jackcess-4.0.8.jar=release/modules/ext/jackcess-4.0.8.jar
file.reference.jackcess-encrypt-4.0.3.jar=release/modules/ext/jackcess-encrypt-4.0.2.jar
file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar
file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar
file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar
Expand All @@ -62,7 +62,7 @@ file.reference.jdom2-2.0.6.1-sources.jar=release/modules/ext/jdom2-2.0.6.1-sourc
file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar
file.reference.jfreechart-1.5.5.jar=release/modules/ext/jfreechart-1.5.5.jar
file.reference.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar
file.reference.jsoup-1.18.3.jar=release/modules/ext/jsoup-1.18.3.jar
file.reference.jsoup-1.21.2.jar=release/modules/ext/jsoup-1.21.2.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.8.jar=release/modules/ext/jxmapviewer2-2.8.jar
Expand Down Expand Up @@ -98,7 +98,7 @@ file.reference.sleuthkit-caseuco-4.14.0.jar=release/modules/ext/sleuthkit-caseuc
file.reference.slf4j-api-1.7.30.jar=release/modules/ext/slf4j-api-1.7.30.jar
file.reference.snakeyaml-2.3.jar=release/modules/ext/snakeyaml-2.3.jar
file.reference.spotbugs-annotations-4.8.6.jar=release/modules/ext/spotbugs-annotations-4.8.6.jar
file.reference.sqlite-jdbc-3.49.1.0.jar=release/modules/ext/sqlite-jdbc-3.49.1.0.jar
file.reference.sqlite-jdbc-3.50.3.0.jar=release/modules/ext/sqlite-jdbc-3.50.3.0.jar
file.reference.xalan-2.7.3.jar=release/modules/ext/xalan-2.7.3.jar
file.reference.xercesImpl-2.12.2.jar=release/modules/ext/xercesImpl-2.12.2.jar
file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar
Expand Down
84 changes: 42 additions & 42 deletions Core/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,64 +386,64 @@
<binary-origin>release/modules/ext/audience-annotations-0.12.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-awt-util-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-awt-util-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-awt-util-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-awt-util-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-constants-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-constants-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-constants-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-constants-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-css-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-css-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-css-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-css-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-dom-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-dom-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-dom-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-dom-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-ext-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-ext-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-ext-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-ext-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-i18n-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-i18n-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-i18n-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-i18n-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-parser-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-parser-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-parser-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-parser-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-shared-resources-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-shared-resources-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-shared-resources-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-shared-resources-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-svg-dom-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-svg-dom-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-svg-dom-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-svg-dom-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-svggen-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-svggen-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-svggen-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-svggen-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-util-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-util-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-util-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-util-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/batik-xml-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-xml-1.18.jar</binary-origin>
<runtime-relative-path>ext/batik-xml-1.19.jar</runtime-relative-path>
<binary-origin>release/modules/ext/batik-xml-1.19.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/bcpkix-jdk18on-1.79.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcpkix-jdk18on-1.79.jar</binary-origin>
<runtime-relative-path>ext/bcpkix-jdk18on-1.81.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcpkix-jdk18on-1.81.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/bcprov-jdk18on-1.79.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcprov-jdk18on-1.79.jar</binary-origin>
<runtime-relative-path>ext/bcprov-jdk18on-1.81.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcprov-jdk18on-1.81.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/bcutil-jdk18on-1.79.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcutil-jdk18on-1.79.jar</binary-origin>
<runtime-relative-path>ext/bcutil-jdk18on-1.81.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bcutil-jdk18on-1.81.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/c3p0-0.10.2.jar</runtime-relative-path>
Expand All @@ -454,16 +454,16 @@
<binary-origin>release/modules/ext/checker-qual-3.43.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
<runtime-relative-path>ext/commons-codec-1.19.0jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-codec-1.19.0jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-dbcp2-2.13.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-dbcp2-2.13.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-io-2.18.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-io-2.18.0.jar</binary-origin>
<runtime-relative-path>ext/commons-io-2.20.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-io-2.20.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-lang3-3.10.jar</runtime-relative-path>
Expand Down Expand Up @@ -538,12 +538,12 @@
<binary-origin>release/modules/ext/j2objc-annotations-3.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackcess-4.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackcess-4.0.7.jar</binary-origin>
<runtime-relative-path>ext/jackcess-4.0.8.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackcess-4.0.8.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackcess-encrypt-4.0.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackcess-encrypt-4.0.2.jar</binary-origin>
<runtime-relative-path>ext/jackcess-encrypt-4.0.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackcess-encrypt-4.0.3.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
Expand Down Expand Up @@ -614,8 +614,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.18.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jsoup-1.18.3.jar</binary-origin>
<runtime-relative-path>ext/jsoup-1.21.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jsoup-1.21.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
Expand Down Expand Up @@ -766,8 +766,8 @@
<binary-origin>release/modules/ext/spotbugs-annotations-4.8.6.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.49.1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.49.1.0.jar</binary-origin>
<runtime-relative-path>ext/sqlite-jdbc-3.50.3.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.50.3.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/xalan-2.7.3.jar</runtime-relative-path>
Expand Down
Loading