From f890bc461504ef5b43aeefe4f8d15c12d43b58c5 Mon Sep 17 00:00:00 2001
From: Dan Hermann <danhermann@users.noreply.github.com>
Date: Mon, 2 Aug 2021 11:24:33 -0500
Subject: [PATCH] [7.x] Upgrade Tika to 1.27 for ingest (#75191) (#75904)

---
 plugins/ingest-attachment/build.gradle                      | 6 +++---
 .../licenses/apache-mime4j-core-0.8.3.jar.sha1              | 1 -
 .../licenses/apache-mime4j-core-0.8.4.jar.sha1              | 1 +
 .../licenses/apache-mime4j-dom-0.8.3.jar.sha1               | 1 -
 .../licenses/apache-mime4j-dom-0.8.4.jar.sha1               | 1 +
 plugins/ingest-attachment/licenses/fontbox-2.0.19.jar.sha1  | 1 -
 plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1  | 1 +
 plugins/ingest-attachment/licenses/pdfbox-2.0.19.jar.sha1   | 1 -
 plugins/ingest-attachment/licenses/pdfbox-2.0.24.jar.sha1   | 1 +
 plugins/ingest-attachment/licenses/tika-core-1.24.jar.sha1  | 1 -
 plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1  | 1 +
 .../ingest-attachment/licenses/tika-parsers-1.24.jar.sha1   | 1 -
 .../ingest-attachment/licenses/tika-parsers-1.27.jar.sha1   | 1 +
 13 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.3.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.4.jar.sha1
 delete mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.3.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.4.jar.sha1
 delete mode 100644 plugins/ingest-attachment/licenses/fontbox-2.0.19.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1
 delete mode 100644 plugins/ingest-attachment/licenses/pdfbox-2.0.19.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/pdfbox-2.0.24.jar.sha1
 delete mode 100644 plugins/ingest-attachment/licenses/tika-core-1.24.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1
 delete mode 100644 plugins/ingest-attachment/licenses/tika-parsers-1.24.jar.sha1
 create mode 100644 plugins/ingest-attachment/licenses/tika-parsers-1.27.jar.sha1

diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
index aedca313802c2..30ba56e8380ab 100644
--- a/plugins/ingest-attachment/build.gradle
+++ b/plugins/ingest-attachment/build.gradle
@@ -15,10 +15,10 @@ esplugin {
 }
 
 versions << [
-  'tika'  : '1.24',
-  'pdfbox': '2.0.19',
+  'tika'  : '1.27',
+  'pdfbox': '2.0.24',
   'poi'   : '4.1.2',
-  'mime4j': '0.8.3'
+  'mime4j': '0.8.4'
 ]
 
 dependencies {
diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.3.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.3.jar.sha1
deleted file mode 100644
index 464a34dd97643..0000000000000
--- a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1179b56c9919c1a8e20d3a528ee4c6cee19bcbe0
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.4.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.4.jar.sha1
new file mode 100644
index 0000000000000..fbe162fb49c90
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.4.jar.sha1
@@ -0,0 +1 @@
+a7e552628c6587bdd1e2036045f1e06c4d513e32
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.3.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.3.jar.sha1
deleted file mode 100644
index 4f98753aa0af4..0000000000000
--- a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e80733714eb6a70895bfc74a9528c658504c2c83
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.4.jar.sha1 b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.4.jar.sha1
new file mode 100644
index 0000000000000..4da110572fe08
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.4.jar.sha1
@@ -0,0 +1 @@
+dfdfdbc095017ffbaef308e80ff7ca53b1a6ff08
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/fontbox-2.0.19.jar.sha1 b/plugins/ingest-attachment/licenses/fontbox-2.0.19.jar.sha1
deleted file mode 100644
index ac83b56e463ad..0000000000000
--- a/plugins/ingest-attachment/licenses/fontbox-2.0.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b8b3873aacde51f1a3f4a052b236de828867d000
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1 b/plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1
new file mode 100644
index 0000000000000..1f6388867917a
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/fontbox-2.0.24.jar.sha1
@@ -0,0 +1 @@
+df8ecb3006dfcd52355a5902096e5ec34f06112e
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/pdfbox-2.0.19.jar.sha1 b/plugins/ingest-attachment/licenses/pdfbox-2.0.19.jar.sha1
deleted file mode 100644
index 14757fabc207c..0000000000000
--- a/plugins/ingest-attachment/licenses/pdfbox-2.0.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8dfcfc278b4b66e1a8b0e9e681b84ffe48da2c21
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/pdfbox-2.0.24.jar.sha1 b/plugins/ingest-attachment/licenses/pdfbox-2.0.24.jar.sha1
new file mode 100644
index 0000000000000..2eb2e357cbf1c
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/pdfbox-2.0.24.jar.sha1
@@ -0,0 +1 @@
+cb562ee5f43e29415af4477e62fbe668ef88d18b
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-core-1.24.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-1.24.jar.sha1
deleted file mode 100644
index 6579753564ddd..0000000000000
--- a/plugins/ingest-attachment/licenses/tika-core-1.24.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed2e85f034743ea8e7ff25ab594caf361c408a44
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1 b/plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1
new file mode 100644
index 0000000000000..2cd08a1849a31
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/tika-core-1.27.jar.sha1
@@ -0,0 +1 @@
+079ad0f72558b8fbce947147959e2faff8b7b70a
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-1.24.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-1.24.jar.sha1
deleted file mode 100644
index 6ce939379f830..0000000000000
--- a/plugins/ingest-attachment/licenses/tika-parsers-1.24.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-282c0ecd31cb235f7d96bef18b8cdcb56573a195
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/tika-parsers-1.27.jar.sha1 b/plugins/ingest-attachment/licenses/tika-parsers-1.27.jar.sha1
new file mode 100644
index 0000000000000..218f8a037e7c3
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/tika-parsers-1.27.jar.sha1
@@ -0,0 +1 @@
+269e021ed326239fd8f62e3ff85f4b4e8dbd6ec9
\ No newline at end of file