From ee75c908d9ac4118e5642508e20055cdcd91cf9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 20:36:23 +0000
Subject: [PATCH 1/2] Bump org.bouncycastle:bcprov-jdk18on from 1.76 to 1.78

Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.76 to 1.78.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk18on
  dependency-type: direct:production
...

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 effebfcbfe..3fbaff3b67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <slf4j.version>2.0.11</slf4j.version>
         <tika.version>2.9.1</tika.version>
         <!-- Sync BouncyCastle & ASM with whatever version Tika uses -->
-        <bouncycastle.version>1.76</bouncycastle.version>
+        <bouncycastle.version>1.78</bouncycastle.version>
         <asm.version>8.0.1</asm.version>
         <!-- Jersey is used to integrate with external sources/services -->
         <jersey.version>3.1.5</jersey.version>

From 2c39ae47159599cea8048406c43ebfefb00eda8e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 3 May 2024 15:59:37 -0500
Subject: [PATCH 2/2] Fix dependency convergence issues

---
 pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3fbaff3b67..ac53637f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,9 @@
         <pdfbox-version>2.0.31</pdfbox-version>
         <rome.version>1.19.0</rome.version>
         <slf4j.version>2.0.11</slf4j.version>
-        <tika.version>2.9.1</tika.version>
+        <tika.version>2.9.2</tika.version>
         <!-- Sync BouncyCastle & ASM with whatever version Tika uses -->
-        <bouncycastle.version>1.78</bouncycastle.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
         <asm.version>8.0.1</asm.version>
         <!-- Jersey is used to integrate with external sources/services -->
         <jersey.version>3.1.5</jersey.version>
@@ -1282,6 +1282,12 @@
                 <artifactId>bcprov-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>org.bouncycastle</groupId>
+                <artifactId>bcutil-jdk18on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
             <!-- Tika and axiom-api (in dspace-swordv2) disagree on versions -->
             <dependency>
                 <groupId>org.apache.james</groupId>