From c4b82dfb830ba014b79552830af86a9940648456 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Tue, 6 Feb 2024 15:44:21 +0100
Subject: [PATCH 1/2] fix(deps): resolve conflicting version of MIME4J #9077

- Apache Abdera Parser, Apache Tika and RESTeasy (Testing) use MIME4J
- Tika and RESTeasy use newer APIs only present since v0.8+
- Abdera is an abandoned project, uses v0.7.2 and is hopefully
  compatible with newer releases
- v0.8.4 given by Apache Tika relies on vulnerable Apache Commons IO
  2.6, we want 2.11 per dependency management. Upgrading to v0.8.7 as
  earliest version with 2.11 dependency
---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index f45e8fd9033..07d73336095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,17 @@
                 <artifactId>abdera-i18n</artifactId>
                 <version>1.1.3</version>
             </dependency>
+            <!-- Dependency for Apache Abdera and Apache Tika. Tika needs newer version. -->
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-mime4j-core</artifactId>
+                <version>0.8.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-mime4j-dom</artifactId>
+                <version>0.8.7</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <!-- Declare any DIRECT dependencies here.

From 477eb068ab411699256008a2ed4b60a67f1d4cb8 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Wed, 7 Feb 2024 07:47:18 +0100
Subject: [PATCH 2/2] chore(deps): update Apache Tika to v2.9.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 07d73336095..b04d8a9e10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <flyway.version>9.22.1</flyway.version>
         <jhove.version>1.20.1</jhove.version>
         <poi.version>5.2.1</poi.version>
-        <tika.version>2.4.1</tika.version>
+        <tika.version>2.9.1</tika.version>
         <netcdf.version>5.5.3</netcdf.version>
     </properties>