Merge branch 'dspace-cris-2024_02_x' into main-cris

Author: vins01-4science

dspace-api/src/main/java/org/dspace/administer/RegistryLoader.java

@@ -112,7 +112,7 @@ public static void main(String[] argv) throws Exception {
                     }
                     // Call MetadataImporter, as it handles Metadata schema updates
                     MetadataImporter.loadRegistry(filename, true);
-                } else if (line.hasOption("all")) {
+                } else if (line.hasOption("a")) {
                     loadAllBitstreamFormats(context);
                     loadAllRegistry();
                 } else {
@@ -150,7 +150,7 @@ private static Options createCommandLineOptions() {
 
         options.addOption("b", "bitstream", true, "load bitstream format registry from specified file");
         options.addOption("m", "metadata", true, "load metadata registry from specified file");
-        options.addOption("a", "all", true, "load all registries related to metadata and bitsreams");
+        options.addOption("a", "all", false, "load all registries related to metadata and bitsreams");
         options.addOption("h", "help", false, "print this help message");
 
         return options;

dspace-server-webapp/pom.xml

@@ -676,14 +676,6 @@
             </exclusions>
         </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.2</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>