mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Tika dependencies to 2.9.2 (#108144) 

This commit bumps Tika to 2.9.2 and manually bumps the transitive versions 
to match 2.9.2's parent POM. This commit also centralizes the dependency 
versions so that you only need to look at 1 list to see the full set of dependencies 
to manually check.
This commit is contained in:
Jake Landis 2024-05-02 10:19:31 -05:00 committed by GitHub
parent a3c00ab1ef
commit 6d20cef931
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 137 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distribution/tools/geoip-cli/build.gradle
View File

@ -17,5 +17,6 @@ dependencies {
compileOnly project(":libs:elasticsearch-cli")
compileOnly project(":libs:elasticsearch-x-content")
testImplementation project(":test:framework")
testImplementation "org.apache.commons:commons-compress:1.24.0"
testImplementation "org.apache.commons:commons-compress:1.26.1"
testImplementation "commons-io:commons-io:2.15.1"
}

5
docs/changelog/108144.yaml Normal file
View File

@ -0,0 +1,5 @@
pr: 108144
summary: Bump Tika dependency to 2.9.2
area: Ingest Node
type: upgrade
issues: []

2
gradle/build.versions.toml
View File

@ -7,7 +7,7 @@ spock = "2.1-groovy-3.0"
[libraries]
ant = "org.apache.ant:ant:1.10.12"
antlrst4 = "org.antlr:ST4:4.3.4"
apache-compress = "org.apache.commons:commons-compress:1.24.0"
apache-compress = "org.apache.commons:commons-compress:1.26.1"
apache-rat = "org.apache.rat:apache-rat:0.11"
asm = { group = "org.ow2.asm", name="asm", version.ref="asm" }
asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" }

254
gradle/verification-metadata.xml
View File

@ -1076,9 +1076,9 @@
<sha256 value="bb11ed3e1f9b6e8ae61a71c4f2cb08b9c27787bf78fb1a9ff335217587856eb7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.zaxxer" name="SparseBitSet" version="1.2">
<artifact name="SparseBitSet-1.2.jar">
<sha256 value="91e6b318c901a0f2dd1f6ce781d62474435ae627d22fbac9b21bbc39ffd804b6" origin="Generated by Gradle"/>
<component group="com.zaxxer" name="SparseBitSet" version="1.3">
<artifact name="SparseBitSet-1.3.jar">
<sha256 value="f76b85adb0c00721ae267b7cfde4da7f71d3121cc2160c9fc00c0c89f8c53c8a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-beanutils" name="commons-beanutils" version="1.7.0">
@ -1116,6 +1116,11 @@
<sha256 value="56595fb20b0b85bc91d0d503dad50bb7f1b9afc0eed5dffa6cbb25929000484d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.16.1">
<artifact name="commons-codec-1.16.1.jar">
<sha256 value="ec87bfb55f22cbd1b21e2190eeda28b2b312ed2a431ee49fbdcc01812d04a5e4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.9">
<artifact name="commons-codec-1.9.jar">
<sha256 value="ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce" origin="Generated by Gradle"/>
@ -1151,9 +1156,9 @@
<sha256 value="961b2f6d87dbacc5d54abf45ab7a6e2495f89b75598962d8c723cea9bc210908" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.14.0">
<artifact name="commons-io-2.14.0.jar">
<sha256 value="e35d1df7232568ed4b81d9a9ed94a0159b3ff6cf1915cc21eef5cb55d7b157a2" origin="Generated by Gradle"/>
<component group="commons-io" name="commons-io" version="2.15.1">
<artifact name="commons-io-2.15.1.jar">
<sha256 value="a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.2">
@ -1820,6 +1825,11 @@
<sha256 value="fbf2c5d275e513c08f4e4fb539726dbf3ac2142af956ba93efb983244f0c36bd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.26.1">
<artifact name="commons-compress-1.26.1.jar">
<sha256 value="27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.4.1">
<artifact name="commons-compress-1.4.1.jar">
<sha256 value="28a00d80716f073d644b9da76e94b5e8ff94de8e9323f06f558fba653fcf5f86" origin="Generated by Gradle"/>
@ -1855,6 +1865,11 @@
<sha256 value="82f528cf718c7a3c2f30fc5bc784e3c6a0a10b17605dadb9e16c82ede11e6064" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-lang3" version="3.14.0">
<artifact name="commons-lang3-3.14.0.jar">
<sha256 value="7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-lang3" version="3.7">
<artifact name="commons-lang3-3.7.jar">
<sha256 value="6e8dc31e046508d9953c96534edf0c2e0bfe6f468966b5b842b3f87e43b6a847" origin="Generated by Gradle"/>
@ -2443,24 +2458,14 @@
<sha256 value="71fcfbe869002c48563cc5979fc734571c8d0d167ccce42970c932f337981f19" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.james" name="apache-mime4j-core" version="0.8.10">
<artifact name="apache-mime4j-core-0.8.10.jar">
<sha256 value="7941ef3a99a999f4960734e272434fa47d67df980babf5ce8fe426bfcaa26c94" origin="Generated by Gradle"/>
<component group="org.apache.james" name="apache-mime4j-core" version="0.8.11">
<artifact name="apache-mime4j-core-0.8.11.jar">
<sha256 value="62a7853523dff0c382065df82fa280c1bf59bcd9b329180d707b0f6f15ceb903" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.james" name="apache-mime4j-core" version="0.8.9">
<artifact name="apache-mime4j-core-0.8.9.jar">
<sha256 value="901486a66c0eeee9d6bd63b1eaa195e164100cf415b0122388813d484947801f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.james" name="apache-mime4j-dom" version="0.8.10">
<artifact name="apache-mime4j-dom-0.8.10.jar">
<sha256 value="1dc362d8e6511d53237c0cfd39c8fce5eb947538338421b85541d3beffb40efb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.james" name="apache-mime4j-dom" version="0.8.9">
<artifact name="apache-mime4j-dom-0.8.9.jar">
<sha256 value="726d04098a6317cf175b3708a736ed4ecbc09cf7673784eaf1f4251f030d2433" origin="Generated by Gradle"/>
<component group="org.apache.james" name="apache-mime4j-dom" version="0.8.11">
<artifact name="apache-mime4j-dom-0.8.11.jar">
<sha256 value="80b301f08e21a6de6d941bb98ef1361ad816c057b7aa61c95cf6249e90d87183" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.kerby" name="kerb-admin" version="1.0.1">
@ -2878,14 +2883,9 @@
<sha256 value="08316826fa2b9357b061e52fa8f19ccae75420c949ebe29e28759d2bddd9b39b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="fontbox" version="2.0.27">
<artifact name="fontbox-2.0.27.jar">
<sha256 value="dc7429868aaf3d313c524b9aab846a405e89ca4927f35762ca4d1a60bce1d7f4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="fontbox" version="2.0.29">
<artifact name="fontbox-2.0.29.jar">
<sha256 value="a4efc56064dd34caf8f38a192c04b32422c72ef3c964c0fbbbe8a6b4564d2830" origin="Generated by Gradle"/>
<component group="org.apache.pdfbox" name="fontbox" version="2.0.31">
<artifact name="fontbox-2.0.31.jar">
<sha256 value="0d36d14d3a43fd7a7d8d84d317ed8201b9d16fcba75b27e54f6f39775348c032" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="jempbox" version="1.8.17">
@ -2893,34 +2893,29 @@
<sha256 value="ded9c81038dd1bbcba18f07e1028d70c9ceaf0b48ac56cea8ab6ec2c255fc1b3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="pdfbox" version="2.0.27">
<artifact name="pdfbox-2.0.27.jar">
<sha256 value="a25ad2a0be6b0bf9eb0e972abd09c34c0e797a3ce2a980d5ff035ff4cf078037" origin="Generated by Gradle"/>
<component group="org.apache.pdfbox" name="pdfbox" version="2.0.31">
<artifact name="pdfbox-2.0.31.jar">
<sha256 value="8a8d10b41961e69ffb8b7f6aa8936d34b96a8854aaf47a8cc081f4289120cef3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="pdfbox" version="2.0.29">
<artifact name="pdfbox-2.0.29.jar">
<sha256 value="69728a41a6e9feb98399560a31c1fe1b6467a66d1a8e33e677da24fda9263937" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi" version="5.2.5">
<artifact name="poi-5.2.5.jar">
<sha256 value="352e1b44a5777af2df3d7dc408cda9f75f932d0e0125fa1a7d336a13c0a663a7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi" version="5.2.3">
<artifact name="poi-5.2.3.jar">
<sha256 value="1d4c81a283e127693db89e85df45119d9d312d5686d2439b5be9445c2c649155" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-ooxml" version="5.2.5">
<artifact name="poi-ooxml-5.2.5.jar">
<sha256 value="c6ad01a10cefa1d2a9c1b552bd4293a3eca29b513353f1ec814041d38da9ec5b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml" version="5.2.3">
<artifact name="poi-ooxml-5.2.3.jar">
<sha256 value="9b8ff6ecf562836299ce15997796e3d47fe063a5956c1c7d3f6e2a4bf6e60b79" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-ooxml-lite" version="5.2.5">
<artifact name="poi-ooxml-lite-5.2.5.jar">
<sha256 value="6d4ce6736c422c52e47ffbfa08c784e1b8c188efb69583ac001a0ab16022d774" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml-lite" version="5.2.3">
<artifact name="poi-ooxml-lite-5.2.3.jar">
<sha256 value="35a200a9bd110b176450179170887bb9eac2dcba47a09d93c91e83afe70b7147" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-scratchpad" version="5.2.3">
<artifact name="poi-scratchpad-5.2.3.jar">
<sha256 value="f0a98ad2a2a8c2863135357224fe8ffb2b4e7bb121d75aff59750eb671451aed" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-scratchpad" version="5.2.5">
<artifact name="poi-scratchpad-5.2.5.jar">
<sha256 value="233b279830c8c68ce57b3202164d5bcee53850a770883c4674cfb8d3dd52fc56" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.rat" name="apache-rat" version="0.11">
@ -2948,119 +2943,64 @@
<sha256 value="3902794d36d9b81da1b7e697f21ed04ccae276cc116eecc640a4cd0fff2691f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-core" version="2.7.0">
<artifact name="tika-core-2.7.0.jar">
<sha256 value="2603961edec8bcee014d2c360e5a9a0cdbf10aa8e6e95cf67abe190c837bb054" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-core" version="2.9.2">
<artifact name="tika-core-2.9.2.jar">
<sha256 value="8c43f48ab8a784f2cda8a386d5f425060d57e3232dc6b49f9915029ac1f0b783" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-core" version="2.9.1">
<artifact name="tika-core-2.9.1.jar">
<sha256 value="1c5241991d9dcdcd74fea0a27600f31e8524a44c61a360e51564850367f96462" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-langdetect-tika" version="2.9.2">
<artifact name="tika-langdetect-tika-2.9.2.jar">
<sha256 value="389d7d32e20d61ea985b5ffcdaef6531b4ecf09a98c04ee7152ef9332a1e5fa9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-langdetect-tika" version="2.7.0">
<artifact name="tika-langdetect-tika-2.7.0.jar">
<sha256 value="4cd03d25d9ae93f26b05188fdfffd4c3f48ce9f423d194437ad7f12d4f8bafc0" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-apple-module" version="2.9.2">
<artifact name="tika-parser-apple-module-2.9.2.jar">
<sha256 value="b6d594bf779055bacf5cef40380fddbda1bf08d4da1225428f559640cea83e0f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-langdetect-tika" version="2.9.1">
<artifact name="tika-langdetect-tika-2.9.1.jar">
<sha256 value="660e641f0c37834fe6485dae3676bbb74fd281926a551345d4510940a8c4f669" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-html-module" version="2.9.2">
<artifact name="tika-parser-html-module-2.9.2.jar">
<sha256 value="bbaad920536b6bbd66e5ae80fd50d08681fa655fa226f84ccf88dc0a83cc5ab4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-apple-module" version="2.7.0">
<artifact name="tika-parser-apple-module-2.7.0.jar">
<sha256 value="e5303a09f926477764620650e47167625b52bb5c46d3f2cb7cdc316cb2017bfd" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.9.2">
<artifact name="tika-parser-microsoft-module-2.9.2.jar">
<sha256 value="4ecc4a54049cb82ebb57dd7220243a50dd1fae9673f9cfd0751b12405d352f76" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-apple-module" version="2.9.1">
<artifact name="tika-parser-apple-module-2.9.1.jar">
<sha256 value="49c9b4d92494e08ccde12b912d82156135d55523873ebde8eab90517b76a4258" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.9.2">
<artifact name="tika-parser-miscoffice-module-2.9.2.jar">
<sha256 value="8847fba5aa0dda13fa7ed6e6ca9079ba94df6a73be990540361744c9e0ae6b74" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-html-module" version="2.7.0">
<artifact name="tika-parser-html-module-2.7.0.jar">
<sha256 value="fdbc91231cbd0b6f671b935e26b6f1a2721a2179941958740eb274d1641460e4" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-pdf-module" version="2.9.2">
<artifact name="tika-parser-pdf-module-2.9.2.jar">
<sha256 value="c436d561f9645c3a6814b62ad93c46864197bc726d43f1d055269f290c631230" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-html-module" version="2.9.1">
<artifact name="tika-parser-html-module-2.9.1.jar">
<sha256 value="b5424dd794e34ed1aa17e5439aac9bd371e7c4180623aed88cfd6ba94015127e" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-text-module" version="2.9.2">
<artifact name="tika-parser-text-module-2.9.2.jar">
<sha256 value="7c957b3ac019825a83553cfce9c59bbf1161734329a91a334044ed4dde60c41f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.7.0">
<artifact name="tika-parser-microsoft-module-2.7.0.jar">
<sha256 value="20c82dc0dba1cba85432cf16fd637fa536905e53e3813ce63ed4a01399cb725b" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-xml-module" version="2.9.2">
<artifact name="tika-parser-xml-module-2.9.2.jar">
<sha256 value="08112db5662be78fb6ef57485abeaab019df8fff4a559ae552ef205b6600a64e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-microsoft-module" version="2.9.1">
<artifact name="tika-parser-microsoft-module-2.9.1.jar">
<sha256 value="4fda48b9eefb2f038b56f7c0504ded5c2a57dc759f757d98af4bdb3a3c66ed08" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.9.2">
<artifact name="tika-parser-xmp-commons-2.9.2.jar">
<sha256 value="859f25e753b30b02f5a352505fcdaf7b39e1b9a46a64aa17bcf239725f579d66" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.7.0">
<artifact name="tika-parser-miscoffice-module-2.7.0.jar">
<sha256 value="4355f3fcf623b062c95e55045584a67dbc97fd2aa543943ec31c0823c45ea4b8" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parser-zip-commons" version="2.9.2">
<artifact name="tika-parser-zip-commons-2.9.2.jar">
<sha256 value="2542778293f331358bb37e32e008831031c0b75d4d27d7b65416829d28ff91c0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-miscoffice-module" version="2.9.1">
<artifact name="tika-parser-miscoffice-module-2.9.1.jar">
<sha256 value="03b69510b48459b40a2bd7b45bdf8fa8b8bf84cc9493bf1096ea15154829acae" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-pdf-module" version="2.7.0">
<artifact name="tika-parser-pdf-module-2.7.0.jar">
<sha256 value="8fd4dc14fcf7a7ddfda683b07e407a092a7d6b1c808c394214c282f476457f57" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-pdf-module" version="2.9.1">
<artifact name="tika-parser-pdf-module-2.9.1.jar">
<sha256 value="8063d7d2162780d7306cdcf59cfde6c0dd14edd11786f0129631f28d1694e948" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-text-module" version="2.7.0">
<artifact name="tika-parser-text-module-2.7.0.jar">
<sha256 value="9c5407747401f3ad1f2f955a55c7610e7f0329e6662ad17751468bffd12a6611" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-text-module" version="2.9.1">
<artifact name="tika-parser-text-module-2.9.1.jar">
<sha256 value="e987c4a212ab5381d0d97ecfd15d3a61e539a344eb4a6145609180dc66919b34" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-xml-module" version="2.7.0">
<artifact name="tika-parser-xml-module-2.7.0.jar">
<sha256 value="871d914b46dd673e005b7e316b98c975799195584d56fe649de73166120459c2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-xml-module" version="2.9.1">
<artifact name="tika-parser-xml-module-2.9.1.jar">
<sha256 value="74454851579c848aee57f8e3a3a1bb6c7048f5a2e9965ec0a1160f4b441a97c3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.7.0">
<artifact name="tika-parser-xmp-commons-2.7.0.jar">
<sha256 value="86021cd5b4cb41c6125aae4d425d0e7e73bfd07b0386ec1d7303cfbb4f9290c4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-xmp-commons" version="2.9.1">
<artifact name="tika-parser-xmp-commons-2.9.1.jar">
<sha256 value="dac578410a10d99527a200c20c94596cd102b281f657c5d23568c8ecc543ca84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-zip-commons" version="2.7.0">
<artifact name="tika-parser-zip-commons-2.7.0.jar">
<sha256 value="82912c8171199f55289a41e664392852d0ed80287e5f43c348b16f5a95d889a2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parser-zip-commons" version="2.9.1">
<artifact name="tika-parser-zip-commons-2.9.1.jar">
<sha256 value="ff208d11c551cdf6e18cbc671ddb1039abbc4e02cbd41e6b900df7ac37da8efc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.xmlbeans" name="xmlbeans" version="5.1.1">
<artifact name="xmlbeans-5.1.1.jar">
<sha256 value="5f484a78bed71cbffe3709678b6bdd3463781a7c61c6d9872330aecbf150762a" origin="Generated by Gradle"/>
<component group="org.apache.xmlbeans" name="xmlbeans" version="5.2.0">
<artifact name="xmlbeans-5.2.0.jar">
<sha256 value="5a344f323c049b7024edd39bbd58a38e77eb44218aad2794879e7f4ac3ca1de1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.yetus" name="audience-annotations" version="0.5.0">
@ -4181,14 +4121,9 @@
<sha256 value="a310bc79c3f4744e2b2e993702fcebaf3696fec0063643ffdc6b49a8fb03ef39" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="jcl-over-slf4j" version="2.0.6">
<artifact name="jcl-over-slf4j-2.0.6.jar">
<sha256 value="7aee1e1a12f4e2b3b42af9453a098132339d419056c178105543f23e79633a69" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="jcl-over-slf4j" version="2.0.9">
<artifact name="jcl-over-slf4j-2.0.9.jar">
<sha256 value="f98f1eb8179bcb312aeb76a607746f4f2d0f03ce265ee78141f5c3c8302102af" origin="Generated by Gradle"/>
<component group="org.slf4j" name="jcl-over-slf4j" version="2.0.10">
<artifact name="jcl-over-slf4j-2.0.10.jar">
<sha256 value="5dc8cec38fdc9b70df4fae9779894c1487c782502a934eaa273c31237bb42d62" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-api" version="1.7.10">
@ -4216,9 +4151,9 @@
<sha256 value="d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-api" version="1.7.5">
<artifact name="slf4j-api-1.7.5.jar">
<sha256 value="fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91" origin="Generated by Gradle"/>
<component group="org.slf4j" name="slf4j-api" version="2.0.10">
<artifact name="slf4j-api-2.0.10.jar">
<sha256 value="b7ddb31a515debbddec8e9145e2cf7b197926f40e454376647724f92e6382043" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-api" version="2.0.6">
@ -4226,11 +4161,6 @@
<sha256 value="2f2a92d410b268139d7d63b75ed25e21995cfe4100c19bf23577cfdbc8077bda" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-api" version="2.0.9">
<artifact name="slf4j-api-2.0.9.jar">
<sha256 value="0818930dc8d7debb403204611691da58e49d42c50b6ffcfdce02dadb7c3c2b6c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-log4j12" version="1.7.10">
<artifact name="slf4j-log4j12-1.7.10.jar">
<sha256 value="2e4eebc6e346c92c417aa4e662738802645ef21c5eb4435132dc78d631f2eebb" origin="Generated by Gradle"/>
@ -4241,16 +4171,16 @@
<sha256 value="4d41e01c40caf8a6c74add2b073055d8a4ce1c30e58154177b13f12d78abbe7b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-nop" version="2.0.10">
<artifact name="slf4j-nop-2.0.10.jar">
<sha256 value="9e6d4b070aad63b6ba8d79f2fb0d93ad9a2b9fc8fb8946c324dfb4202dae0016" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-nop" version="2.0.6">
<artifact name="slf4j-nop-2.0.6.jar">
<sha256 value="7966dcd73078250f38595223b1e807cd7566188a56236def031e265426056fc8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-nop" version="2.0.9">
<artifact name="slf4j-nop-2.0.9.jar">
<sha256 value="5612367b12bac3eacf4e6ff4e06ce5ba1c83c4d8d6d5e2ea5f924635717a6d83" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.slf4j" name="slf4j-simple" version="2.0.6">
<artifact name="slf4j-simple-2.0.6.jar">
<sha256 value="547f06226cfcbcca198669e7498f6a6d2a55a84de5dd6eb46579f11fc40fc5d8" origin="Generated by Gradle"/>

54
modules/ingest-attachment/build.gradle
View File

@ -17,12 +17,28 @@ esplugin {
// this overwrites the 'versions' map from Elasticsearch itself, but indeed we want that -- we're interested in managing our dependencies
// as we (and tika) demand, and are not interested in, say, having the same version of commons-codec as elasticsearch itself
// when updating tika, please review it's parent pom : https://repo1.maven.org/maven2/org/apache/tika/tika-parent
// and manually update the transitive dependencies here
def versions = [
'tika' : '2.9.1',
'pdfbox': '2.0.29',
'poi' : '5.2.3',
'mime4j': '0.8.10',
'commonsCodec': '1.16.0'
'tika' : '2.9.2',
'pdfbox': '2.0.31',
'poi' : '5.2.5',
'sparsebitset' : '1.3', //poi dependency: https://repo1.maven.org/maven2/org/apache/poi/poi/
'mime4j': '0.8.11',
'commonsCodec': '1.16.1',
'slf4' : '2.0.10',
'xz' : '1.9',
'commonsIo' : '2.15.1',
//intentionally using the elder "juniversalchardet:juniversalchardet" rather than the newer "com.github.albfernandez:juniversalchardet"
//since the "com.github.albfernandez" fork has some problems with Chinese.
'juniversalchardet' : '1.0.3',
'tagsoup' : '1.2.1',
'jempbox' : '1.8.17',
'xmlbeans' : '5.2.0', //poi-ooxml dependency: https://repo1.maven.org/maven2/org/apache/poi/poi-ooxml/
'commonsCollections4' : '4.4',
'commonsCompress' : '1.26.1',
'commonsLang3' :'3.14.0',
'commonsMath3' : '3.6.1'
]
// exclude commons-logging from test dependencies to avoid jar-hell, we use jcl-over-slf4j here
@ -39,8 +55,8 @@ configurations.testCompileClasspath {
dependencies {
// take over logging for all dependencies
api "org.slf4j:slf4j-api:2.0.9"
api "org.slf4j:jcl-over-slf4j:2.0.9"
api "org.slf4j:slf4j-api:${versions.slf4}"
api "org.slf4j:jcl-over-slf4j:${versions.slf4}"
// route slf4j over log4j
// TODO blocked on https://github.com/elastic/elasticsearch/issues/93714
@ -48,7 +64,7 @@ dependencies {
// nop all slf4j logging
// workaround for https://github.com/elastic/elasticsearch/issues/93714
api "org.slf4j:slf4j-nop:2.0.9"
api "org.slf4j:slf4j-nop:${versions.slf4}"
// mandatory for tika
api "org.apache.tika:tika-core:${versions.tika}"
@ -63,39 +79,39 @@ dependencies {
api "org.apache.tika:tika-parser-apple-module:${versions.tika}"
api "org.apache.tika:tika-parser-xmp-commons:${versions.tika}"
api "org.apache.tika:tika-parser-zip-commons:${versions.tika}"
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.14.0'
api "org.tukaani:xz:${versions.xz}"
api "commons-io:commons-io:${versions.commonsIo}"
// character set detection
api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
api "com.googlecode.juniversalchardet:juniversalchardet:${versions.juniversalchardet}"
// external parser libraries
// HTML
api 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
api "org.ccil.cowan.tagsoup:tagsoup:${versions.tagsoup}"
// Adobe PDF
api "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
api "org.apache.pdfbox:jempbox:1.8.17"
api "org.apache.pdfbox:jempbox:${versions.jempbox}"
// OpenOffice
api "org.apache.poi:poi-ooxml:${versions.poi}"
api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
api "org.apache.poi:poi:${versions.poi}"
api "commons-codec:commons-codec:${versions.commonsCodec}"
api 'org.apache.xmlbeans:xmlbeans:5.1.1'
api 'org.apache.commons:commons-collections4:4.4'
api "org.apache.xmlbeans:xmlbeans:${versions.xmlbeans}"
api "org.apache.commons:commons-collections4:${versions.commonsCollections4}"
// MS Office
api "org.apache.poi:poi-scratchpad:${versions.poi}"
// Apple iWork
api 'org.apache.commons:commons-compress:1.24.0'
api "org.apache.commons:commons-compress:${versions.commonsCompress}"
// Outlook documents
api "org.apache.james:apache-mime4j-core:${versions.mime4j}"
api "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
// EPUB books
api "org.apache.commons:commons-lang3:3.13.0"
api "org.apache.commons:commons-lang3:${versions.commonsLang3}"
// Microsoft Word files with visio diagrams
api 'org.apache.commons:commons-math3:3.6.1'
api "org.apache.commons:commons-math3:${versions.commonsMath3}"
// POIs dependency
api 'com.zaxxer:SparseBitSet:1.2'
api "com.zaxxer:SparseBitSet:${versions.sparsebitset}"
}
restResources {

3
test/x-content/build.gradle
View File

@ -18,7 +18,8 @@ dependencies {
implementation "com.networknt:json-schema-validator:${versions.networknt_json_schema_validator}"
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
implementation "org.apache.commons:commons-compress:1.24.0"
implementation "org.apache.commons:commons-compress:1.26.1"
implementation "commons-io:commons-io:2.15.1"
implementation "org.apache.commons:commons-lang3:${versions.commons_lang3}"
}