From d7261481d1d46eaeaca716b8aff77b684c602898 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:23:18 +0000
Subject: [PATCH 1/2] Bump tika.version from 2.9.2 to 2.9.3

Bumps `tika.version` from 2.9.2 to 2.9.3.

Updates `org.apache.tika:tika-core` from 2.9.2 to 2.9.3
- [Changelog](https://github.com/apache/tika/blob/2.9.3/CHANGES.txt)
- [Commits](https://github.com/apache/tika/compare/2.9.2...2.9.3)

Updates `org.apache.tika:tika-parsers-standard-package` from 2.9.2 to 2.9.3

---
updated-dependencies:
- dependency-name: org.apache.tika:tika-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-parsers-standard-package
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3477e48edd..a2883f98ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <pdfbox-version>2.0.33</pdfbox-version>
         <rome.version>1.19.0</rome.version>
         <slf4j.version>2.0.16</slf4j.version>
-        <tika.version>2.9.2</tika.version>
+        <tika.version>2.9.3</tika.version>
         <!-- Sync BouncyCastle & ASM with whatever version Tika uses -->
         <bouncycastle.version>1.80</bouncycastle.version>
         <asm.version>8.0.1</asm.version>

From 6265c3d45b508c2bc35d5c23c3d7fca40fdf2568 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 11 Feb 2025 10:39:16 -0600
Subject: [PATCH 2/2] Dependency convergence fix

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index a2883f98ea..7cb9ee80c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1312,6 +1312,12 @@
                 <artifactId>bcutil-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
+            <!-- Tika brings in multiple versions of this. Select the latest version. Always sync with Tika version -->
+            <dependency>
+                <groupId>com.healthmarketscience.jackcess</groupId>
+                <artifactId>jackcess</artifactId>
+                <version>4.0.8</version>
+            </dependency>
             <!-- Tika and axiom-api (in dspace-swordv2) disagree on versions -->
             <dependency>
                 <groupId>org.apache.james</groupId>