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

# Conflicts:
#	dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java

Author: atarix83

dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java

@@ -442,7 +442,7 @@ public void list(String processName, PrintStream out, PrintStream err, Integer .
      * @param doiRow        DOI to register
      * @param filter        logical item filter to override
      * @throws IllegalArgumentException
-     *                      if {@link doiRow} does not name an Item.
+     *                      if {@code doiRow} does not name an Item.
      * @throws IllegalStateException
      *                      on invalid DOI.
      * @throws RuntimeException
@@ -737,7 +737,7 @@ public DOI resolveToDOI(String identifier)
         DOI doiRow = null;
         String doi = null;
 
-        // detect it identifier is ItemID, handle or DOI.
+        // detect if identifier is ItemID, handle or DOI.
         // try to detect ItemID
         if (identifier
             .matches("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}")) {

dspace-api/src/test/data/dspaceFolder/config/local.cfg

@@ -249,6 +249,24 @@ ldn.ip-range.enabled = true
 ldn.notify.inbox.block-untrusted = true
 ldn.notify.inbox.block-untrusted-ip = true
 
+# The list of the supported events incoming from openaire (see also dspace/config/spring/api/qaevents.xml)
+# add missing abstract suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/ABSTRACT
+# add missing publication id suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/PID
+# add more publication id suggestion
+qaevents.openaire.import.topic = ENRICH/MORE/PID
+# add missing project suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/PROJECT
+# add more project suggestion
+qaevents.openaire.import.topic = ENRICH/MORE/PROJECT
+# add more review
+qaevents.openaire.import.topic = ENRICH/MORE/REVIEW
+# add more endorsement
+qaevents.openaire.import.topic = ENRICH/MORE/ENDORSEMENT
+# add more release/relationship
+qaevents.openaire.import.topic = ENRICH/MORE/LINK
+
 ###########################################
 # ERROR LOGGING                           #
 ###########################################

dspace/config/modules/ldn.cfg

@@ -28,7 +28,7 @@ ldn.processor.max.attempts = 5
 # LDN Queue extractor sets LDN Message Entity queue_timeout property every time it tries a new elaboration
 # of the message. LDN Message with a future queue_timeout is not elaborated. This property is used to calculateas:
 # a new timeout, such as: new_timeout = now + ldn.processor.queue.msg.timeout (in minutes)
-ldn.processor.queue.msg.timeout = 60
+ldn.processor.queue.msg.timeout = 1
 
 # Blocks the storage of incoming LDN messages with unknown Notify Service (origin)
 ldn.notify.inbox.block-untrusted = true
@@ -38,7 +38,7 @@ ldn.notify.inbox.block-untrusted = true
 ldn.notify.inbox.block-untrusted-ip = true
 
 # this is the medatada used to retrieve the relation with external items when sending relationship requests
-#ldn.notify.relation.metadata = dc.relation
+ldn.notify.relation.metadata = dc.relation
 
 
 # EMAIL CONFIGURATION

pom.xml

@@ -1993,6 +1993,12 @@
                 <version>${log4j.version}</version>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-layout-template-json</artifactId>
+                <version>${log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>