Skip to content

Commit

Permalink
[7x] ingest attachment dependency version bumps (#104169)
Browse files Browse the repository at this point in the history
This commit bumps the follow dependency version for the ingest attachment plugin:

tika-core 1.27 -> 1.28.5
tika-parsers 1.27 -> 1.28.5
commons-io 2.6 -> 2.11
fontbox 2.0.24 -> 2.0.26
poi 4.1.2 -> 5.2.2
poi-ooxml 4.1.2 -> 5.2.2
and poi-/ooxml-schemas is now poi-ooxml-lite and is using 5.2.2
(see poi.apache.org/changes.html)
xmlbeans 3.0.1 -> 5.0.3

These versions were chosen from one of the following POM files:
repo1.maven.org/maven2/org/apache/tika/tika-parent/1.28.5/tika-parent-1.28.5.pom
repo1.maven.org/maven2/org/apache/tika/tika-parsers/1.28.5/tika-parsers-1.28.5.pom
repo1.maven.org/maven2/org/apache/tika/tika-core/1.28.5/tika-core-1.28.5.pom
repo1.maven.org/maven2/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2.pom
  • Loading branch information
jakelandis authored Jan 10, 2024
1 parent ebe2e02 commit f82944c
Show file tree
Hide file tree
Showing 21 changed files with 57 additions and 42 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/104169.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 104169
summary: "[7x] ingest attachment dependency version bumps"
area: Ingest Node
type: upgrade
issues: []
64 changes: 37 additions & 27 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,11 @@
<sha256 value="f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.7">
<artifact name="commons-io-2.7.jar">
<sha256 value="4547858fff38bbf15262d520685b184a3dce96897bc1844871f055b96e8f6e95" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.8.0">
<artifact name="commons-io-2.8.0.jar">
<sha256 value="02f291e5d1243dc143496e3cbbb40a1ced47aa58f2d633d3e38780cd068d5074" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -3097,39 +3102,39 @@
<sha256 value="08316826fa2b9357b061e52fa8f19ccae75420c949ebe29e28759d2bddd9b39b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="fontbox" version="2.0.24">
<artifact name="fontbox-2.0.24.jar">
<sha256 value="2e8c0a569a90b04734fbc0c805d77f4ec03f98c11f5705055ccd7718c1953d68" origin="Generated by Gradle"/>
<component group="org.apache.pdfbox" name="fontbox" version="2.0.26">
<artifact name="fontbox-2.0.26.jar">
<sha256 value="94674c7d10ea45d9b0dc10387892637fc8efb5c69d2e72694f1c66feb9bb6ed7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="jempbox" version="1.8.16">
<artifact name="jempbox-1.8.16.jar">
<sha256 value="ebef7cca5a5a77768e686972b4a89f0ffce7b46907fd96ac3d4f6ce2fa038055" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.pdfbox" name="pdfbox" version="2.0.24">
<artifact name="pdfbox-2.0.24.jar">
<sha256 value="3c2c0553ec0e7533c490b4c952e1af113621de5275af6e380e11d0d9a0a4f3d6" origin="Generated by Gradle"/>
<component group="org.apache.pdfbox" name="pdfbox" version="2.0.26">
<artifact name="pdfbox-2.0.26.jar">
<sha256 value="b46ebb4140384b45a39e91e23b595ce9dcd8ba3a9ee914f15f40a42a9f805373" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi" version="4.1.2">
<artifact name="poi-4.1.2.jar">
<sha256 value="ab1612406541968434044b2defad58aa8b657cad073baa22a04faaf9d7fb9d1c" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi" version="5.2.2">
<artifact name="poi-5.2.2.jar">
<sha256 value="eeef0dd476b1748d66defa98dcb6abbf0a049b48889af80b985ba713ac7d9409" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml" version="4.1.2">
<artifact name="poi-ooxml-4.1.2.jar">
<sha256 value="0aaaeeee3f5831b036b7053f8048b0f83aa9fa8897771ffd871ddfc84653eba1" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-ooxml" version="5.2.2">
<artifact name="poi-ooxml-5.2.2.jar">
<sha256 value="07104ec94ca97f342d66aec59346f9651ee8c8b896710b6add72c85e91c0b8d1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-ooxml-schemas" version="4.1.2">
<artifact name="poi-ooxml-schemas-4.1.2.jar">
<sha256 value="b4c579f34c377008ec16a5a784539b73776a1dcedf15196f88a80f1b208d9bb2" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-ooxml-lite" version="5.2.2">
<artifact name="poi-ooxml-lite-5.2.2.jar">
<sha256 value="77fb2b66efb4ad324095642b67147c655234a9d134bd73dcda357f82c3b88f13" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.poi" name="poi-scratchpad" version="4.1.2">
<artifact name="poi-scratchpad-4.1.2.jar">
<sha256 value="4ad6a0579a0a216ff951a80f11c648792268189591fe86015b9d197d650424f3" origin="Generated by Gradle"/>
<component group="org.apache.poi" name="poi-scratchpad" version="5.2.2">
<artifact name="poi-scratchpad-5.2.2.jar">
<sha256 value="20c0318d1c3ac3ea45ad58b05e97db3581504fbaf493c77d30718d914a072c69" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.rat" name="apache-rat" version="0.11">
Expand Down Expand Up @@ -3157,19 +3162,19 @@
<sha256 value="3902794d36d9b81da1b7e697f21ed04ccae276cc116eecc640a4cd0fff2691f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-core" version="1.27">
<artifact name="tika-core-1.27.jar">
<sha256 value="73e66926394d0afefa0e6a0c3d836912accc7e105f550db7a72f5f7a57a9b24c" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-core" version="1.28.5">
<artifact name="tika-core-1.28.5.jar">
<sha256 value="e64b3dc06c60b98ecbdfb9dbc3857f4ab54f9548eedd449ee0de39c0df5e3170" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.tika" name="tika-parsers" version="1.27">
<artifact name="tika-parsers-1.27.jar">
<sha256 value="4853d76d66fec80d437c3855817b304aa51af9404c14c4354a642707f25ccd94" origin="Generated by Gradle"/>
<component group="org.apache.tika" name="tika-parsers" version="1.28.5">
<artifact name="tika-parsers-1.28.5.jar">
<sha256 value="ef3a343e1c107a7f2679f1e36b8c5c8f313a2846c46bee5be74562cf6b37ea7f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.xmlbeans" name="xmlbeans" version="3.0.1">
<artifact name="xmlbeans-3.0.1.jar">
<sha256 value="ec7b2aa7e1352753d18ac2daa7a68880f160a26087ede464ed329807238c0922" origin="Generated by Gradle"/>
<component group="org.apache.xmlbeans" name="xmlbeans" version="5.0.3">
<artifact name="xmlbeans-5.0.3.jar">
<sha256 value="b662cba69fe211084c603ecd5733d93d4f97d64c5e273b9c7fdd521122f63fe9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.yetus" name="audience-annotations" version="0.5.0">
Expand Down Expand Up @@ -4285,6 +4290,11 @@
<sha256 value="8c7964b36fe3f0cbe644b04fcbff84e491ce81917db2f5bfa0cba8e9548aff5d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.tukaani" name="xz" version="1.9">
<artifact name="xz-1.9.jar">
<sha256 value="211b306cfc44f8f96df3a0a3ddaf75ba8c5289eed77d60d72f889bb855f535e5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.vafer" name="jdeb" version="1.8">
<artifact name="jdeb-1.8.jar">
<sha256 value="374fe02a09314da6ec8219e005598e760323a1abe4b715cc33ce3e2a9bcda932" origin="Generated by Gradle"/>
Expand Down
14 changes: 7 additions & 7 deletions plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ esplugin {
}

versions << [
'tika' : '1.27',
'pdfbox': '2.0.24',
'poi' : '4.1.2',
'tika' : '1.28.5',
'pdfbox': '2.0.26',
'poi' : '5.2.2',
'mime4j': '0.8.4'
]

Expand All @@ -26,8 +26,8 @@ dependencies {
api "org.apache.tika:tika-core:${versions.tika}"
// build against Jackson 2.9.5, but still works on our current version
api "org.apache.tika:tika-parsers:${versions.tika}"
api 'org.tukaani:xz:1.8'
api 'commons-io:commons-io:2.6'
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.11.0'
api "org.slf4j:slf4j-api:${versions.slf4j}"

// character set detection
Expand All @@ -47,9 +47,9 @@ dependencies {
// OpenOffice
api "org.apache.poi:poi-ooxml:${versions.poi}"
api "org.apache.poi:poi:${versions.poi}"
api "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'org.apache.xmlbeans:xmlbeans:3.0.1'
api 'org.apache.xmlbeans:xmlbeans:5.0.3'
api 'org.apache.commons:commons-collections4:4.1'
// MS Office
api "org.apache.poi:poi-scratchpad:${versions.poi}"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a2503f302b11ebde7ebc3df41daebe0e4eea3689
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/commons-io-2.6.jar.sha1

This file was deleted.

1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/fontbox-2.0.26.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e416198adde54b753e41d3312f799640dac5687
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/poi-4.1.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/poi-5.2.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5513d31545085c33809c4b6553c2009fd19a6016

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a201b5bdc92c0fae4bed4b8e5546388c4c2f9eb0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5df31b69375131fc2163a5557093cb112be90ce1

This file was deleted.

1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eb7c7d4b2e159e03dca986c41b79dfb2ed82005b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19aec6d3994f23109f8836dabd56a6b3657f8de3
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/xmlbeans-3.0.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/xmlbeans-5.0.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e1ef1382ae9dfb2438b82b6dd575566355c2f30f

0 comments on commit f82944c

Please sign in to comment.