From b8cb0008833f765787206e18140d5645c393b197 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:56:32 +0000
Subject: [PATCH 1/2] Bump net.minidev:json-smart from 2.5.0 to 2.5.1

Bumps [net.minidev:json-smart](https://github.com/netplex/json-smart-v2) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](https://github.com/netplex/json-smart-v2/compare/2.5.0...2.5.1)

---
updated-dependencies:
- dependency-name: net.minidev:json-smart
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 dspace-server-webapp/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 8d2bb9ff97a..b44fa0ab072 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -299,7 +299,7 @@
             <!--<dependency>
                 <groupId>net.minidev</groupId>
                 <artifactId>json-smart</artifactId>
-                <version>2.5.0</version>
+                <version>2.5.1</version>
             </dependency>-->
         </dependencies>
     </dependencyManagement>
@@ -560,7 +560,7 @@
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.1</version>
         </dependency>
 
         <dependency>

From d31198b525d240b407d0a44f914cb1ab1ee71398 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 15 Nov 2024 13:41:37 -0600
Subject: [PATCH 2/2] Resolve dependency convergence issue

---
 dspace-server-webapp/pom.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index b44fa0ab072..b64829f91a4 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -293,14 +293,6 @@
                 <artifactId>spring-expression</artifactId>
                 <version>${spring.version}</version>
             </dependency>
-
-            <!-- Specify the version of json-smart we want to use.
-                 This solves a version mismatch between nimbus-jose-jwt and json-path below. -->
-            <!--<dependency>
-                <groupId>net.minidev</groupId>
-                <artifactId>json-smart</artifactId>
-                <version>2.5.1</version>
-            </dependency>-->
         </dependencies>
     </dependencyManagement>
 
@@ -610,6 +602,13 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
+            <exclusions>
+                <!-- We pull in a later version above -->
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>