From ae52525f5fa2732d4155ea54a7ff63ab49de2097 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 14:32:06 -0500 Subject: [PATCH 1/9] Updating tika to 2.9.3 --- gradle/verification-metadata.xml | 200 +++++++++++-------------- modules/ingest-attachment/build.gradle | 22 +-- 2 files changed, 101 insertions(+), 121 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d546e80d1a8a4..0dad74e1730d2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1251,16 +1251,16 @@ - - - - - + + + + + @@ -1291,21 +1291,16 @@ - - - - - - - - - - + + + + + @@ -2048,14 +2043,9 @@ - - - - - - - - + + + @@ -2083,19 +2073,9 @@ - - - - - - - - - - - - - + + + @@ -2711,14 +2691,14 @@ - - - + + + - - - + + + @@ -3181,9 +3161,9 @@ - - - + + + @@ -3191,29 +3171,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3241,64 +3221,64 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -4554,9 +4534,9 @@ - - - + + + @@ -4589,9 +4569,9 @@ - - - + + + @@ -4609,9 +4589,9 @@ - - - + + + @@ -4679,16 +4659,16 @@ + + + + + - - - - - diff --git a/modules/ingest-attachment/build.gradle b/modules/ingest-attachment/build.gradle index a172112948fd3..993c02993c571 100644 --- a/modules/ingest-attachment/build.gradle +++ b/modules/ingest-attachment/build.gradle @@ -19,24 +19,24 @@ esplugin { // 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.2', - 'pdfbox': '2.0.31', - 'poi' : '5.2.5', + 'tika' : '2.9.3', + 'pdfbox': '2.0.33', + 'poi' : '5.4.0', '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', + 'mime4j': '0.8.12', + 'commonsCodec': '1.18.0', + 'slf4' : '2.0.16', + 'xz' : '1.10', + 'commonsIo' : '2.18.0', //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/ + 'xmlbeans' : '5.3.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', + 'commonsCompress' : '1.27.1', + 'commonsLang3' :'3.17.0', 'commonsMath3' : '3.6.1' ] From 5df85f24de71778f71376692e287b93298eedd61 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 14:35:01 -0500 Subject: [PATCH 2/9] Update docs/changelog/127353.yaml --- docs/changelog/127353.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/127353.yaml diff --git a/docs/changelog/127353.yaml b/docs/changelog/127353.yaml new file mode 100644 index 0000000000000..1fde8f97115fd --- /dev/null +++ b/docs/changelog/127353.yaml @@ -0,0 +1,5 @@ +pr: 127353 +summary: Updating tika to 2.9.3 +area: Ingest Node +type: upgrade +issues: [] From e35b81bb1620e0eab8cdd4596f19bdcb9e966f4e Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 14:44:38 -0500 Subject: [PATCH 3/9] putting xz 1.9 checksum back in because something else uses it --- gradle/verification-metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0dad74e1730d2..bf55fab727055 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4669,6 +4669,11 @@ + + + + + From 54cf5890e89a900a3dcb0baa760db601697e7a72 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 14:52:51 -0500 Subject: [PATCH 4/9] putting commons-io 2.15.1 checksum back in because something else uses it --- gradle/verification-metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index bf55fab727055..1a253a709ccf1 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1291,6 +1291,11 @@ + + + + + From 9f32803c43745c2888893bd6bd94042d6a0c7e8a Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 15:03:35 -0500 Subject: [PATCH 5/9] putting commons-codec 1.16.1, commons-compress 1.26.1, and commons-lang3-3.14.0 checksums back in because something else uses them --- gradle/verification-metadata.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 1a253a709ccf1..ce8b2f7d98b4f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1251,6 +1251,11 @@ + + + + + @@ -2048,6 +2053,10 @@ + + + + @@ -2078,6 +2087,11 @@ + + + + + From da4e33ee7d329dfb3e8ec72bd66c41a877508fbd Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 15:10:16 -0500 Subject: [PATCH 6/9] fixing a typo --- gradle/verification-metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ce8b2f7d98b4f..8e36aa80355a1 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2057,6 +2057,7 @@ + From d2f6a564e20398a9ebd0ec07f9a9a12418dd420c Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 15:20:27 -0500 Subject: [PATCH 7/9] putting commons-io 2.16.1 checksum back in because something else uses it --- gradle/verification-metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8e36aa80355a1..6bec6ddccf21d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1301,6 +1301,11 @@ + + + + + From 65bfc9fa8ff1fd49365fcda853c3e0582d4b590e Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 15:42:30 -0500 Subject: [PATCH 8/9] putting commons-compress 1.24.0 checksum back in because something else uses it --- gradle/verification-metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6bec6ddccf21d..fb97170c67e3f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2058,6 +2058,11 @@ + + + + + From 4118a84d9ef83350d8585f0f7290e7d6baf8c880 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 24 Apr 2025 15:49:21 -0500 Subject: [PATCH 9/9] removing weird whitespace --- gradle/verification-metadata.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index fb97170c67e3f..15e2b6df77f60 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2058,10 +2058,10 @@ - - - - + + + +