Bump com.amazonaws:aws-java-sdk-s3 from 1.12.791 to 1.12.792

Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.791 to 1.12.792.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.791...1.12.792)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-version: 1.12.792
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -1,118 +0,0 @@
-#-------------------
-# DSpace's dependabot rules. Enables maven updates for all dependencies on a weekly basis
-# for main and any maintenance branches. Security updates only apply to main.
-#-------------------
-version: 2
-updates:
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    # Allow up to 10 open PRs for dependencies
-    open-pull-requests-limit: 10
-    # Group together some upgrades in a single PR
-    groups:
-      # Group together all Build Tools in a single PR
-      build-tools:
-        applies-to: version-updates
-        patterns:
-        - "org.apache.maven.plugins:*"
-        - "*:*-maven-plugin"
-        - "*:maven-*-plugin"
-        - "com.github.spotbugs:spotbugs"
-        - "com.google.code.findbugs:*"
-        - "com.google.errorprone:*"
-        - "com.puppycrawl.tools:checkstyle"
-        - "org.sonatype.plugins:*"
-        exclude-patterns:
-        # Exclude anything from Spring, as that is in a separate group
-        - "org.springframework.*:*"
-        update-types:
-        - "minor"
-        - "patch"
-      test-tools:
-        applies-to: version-updates
-        patterns:
-        - "junit:*"
-        - "com.github.stefanbirker:system-rules"
-        - "com.h2database:*"
-        - "io.findify:s3mock*"
-        - "io.netty:*"
-        - "org.hamcrest:*"
-        - "org.mock-server:*"
-        - "org.mockito:*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all Apache Commons deps in a single PR
-      apache-commons:
-        applies-to: version-updates
-        patterns:
-        - "org.apache.commons:*"
-        - "commons-*:commons-*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all fasterxml deps in a single PR
-      fasterxml:
-        applies-to: version-updates
-        patterns:
-        - "com.fasterxml:*"
-        - "com.fasterxml.*:*"
-        update-types:
-        - "minor"
-        - "patch"
-       # Group together all Hibernate deps in a single PR
-      hibernate:
-        applies-to: version-updates
-        patterns:
-        - "org.hibernate.*:*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all Jakarta deps in a single PR
-      jakarta:
-        applies-to: version-updates
-        patterns:
-        - "jakarta.*:*"
-        - "org.eclipse.angus:jakarta.mail"
-        - "org.glassfish.jaxb:jaxb-runtime"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all Google deps in a single PR
-      google-apis:
-        applies-to: version-updates
-        patterns:
-        - "com.google.apis:*"
-        - "com.google.api-client:*"
-        - "com.google.http-client:*"
-        - "com.google.oauth-client:*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all Spring deps in a single PR
-      spring:
-        applies-to: version-updates
-        patterns:
-        - "org.springframework:*"
-        - "org.springframework.*:*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all WebJARs deps in a single PR
-      webjars:
-        applies-to: version-updates
-        patterns:
-        - "org.webjars:*"
-        - "org.webjars.*:*"
-        update-types:
-        - "minor"
-        - "patch"
-    ignore:
-      # Don't try to auto-update any DSpace dependencies
-      - dependency-name: "org.dspace:*"
-      - dependency-name: "org.dspace.*:*"
-      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]

.github/workflows/build.yml

@@ -21,11 +21,11 @@ jobs:
       # Also specify version of Java to use (this can allow us to optionally run tests on multiple JDKs in future)
       matrix:
         include:
-          # NOTE: Unit Tests include deprecated REST API v6 (as it has unit tests)
+          # NOTE: Unit Tests include a retry for occasionally failing tests
           #  - surefire.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
           - type: "Unit Tests"
-            java: 11
-            mvnflags: "-DskipUnitTests=false -Pdspace-rest -Dsurefire.rerunFailingTestsCount=2"
+            java: 17
+            mvnflags: "-DskipUnitTests=false -Dsurefire.rerunFailingTestsCount=2"
             resultsdir: "**/target/surefire-reports/**"
           # NOTE: ITs skip all code validation checks, as they are already done by Unit Test job.
           #  - enforcer.skip     => Skip maven-enforcer-plugin rules
@@ -34,7 +34,7 @@ jobs:
           #  - xml.skip          => Skip all XML/XSLT validation by xml-maven-plugin
           #  - failsafe.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
           - type: "Integration Tests"
-            java: 11
+            java: 17
             mvnflags: "-DskipIntegrationTests=false -Denforcer.skip=true -Dcheckstyle.skip=true -Dlicense.skip=true -Dxml.skip=true -Dfailsafe.rerunFailingTestsCount=2"
             resultsdir: "**/target/failsafe-reports/**"
       # Do NOT exit immediately if one matrix job fails

.github/workflows/codescan.yml

@@ -41,13 +41,13 @@ jobs:
       - name: Install JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           # Codescan Javascript as well since a few JS files exist in REST API's interface
           languages: java, javascript
@@ -56,8 +56,8 @@ jobs:
       # NOTE: Based on testing, this autobuild process works well for DSpace. A custom
       # DSpace build w/caching (like in build.yml) was about the same speed as autobuild.
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # Perform GitHub Code Scanning.
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/docker.yml

@@ -165,6 +165,7 @@ jobs:
       # Enable all optional modules / controllers for this test deployment.
       # This helps check for errors in deploying these modules via Spring Boot
       iiif__P__enabled: true
+      ldn__P__enabled: true
       oai__P__enabled: true
       rdf__P__enabled: true
       signposting__P__enabled: true
@@ -219,6 +220,19 @@ jobs:
           result=$(wget -O- -q http://127.0.0.1:8080/server/api/core/collections)
           echo "$result"
           echo "$result" |  grep -oE "\"Dog in Yard\","
+      # Verify basic backend logging is working.
+      # 1. Access the top communities list. Verify that the "Before request" INFO statement is logged
+      # 2. Access an invalid endpoint (and ignore 404 response). Verify that a "status:404" WARN statement is logged
+      - name: Verify backend is logging properly
+        run: |
+          wget -O/dev/null -q http://127.0.0.1:8080/server/api/core/communities/search/top
+          logs=$(docker compose -f docker-compose.yml logs -n 5 dspace)
+          echo "$logs"
+          echo "$logs" | grep -o "Before request \[GET /server/api/core/communities/search/top\]"
+          wget -O/dev/null -q http://127.0.0.1:8080/server/api/does/not/exist || true
+          logs=$(docker compose -f docker-compose.yml logs -n 5 dspace)
+          echo "$logs"
+          echo "$logs" | grep -o "status:404 exception: The repository type does.not was not found"
       # Verify Handle Server can be stared and is working properly
       # 1. First generate the "[dspace]/handle-server" folder with the sitebndl.zip
       # 2. Start the Handle Server (and wait 20 seconds to let it start up)

.github/workflows/reusable-docker-build.yml

@@ -71,8 +71,7 @@ env:
   # See "Redeploy" steps below for more details.
   REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }}
   REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }}
-  # Current DSpace maintenance branch (and architecture) which is deployed to demo.dspace.org / sandbox.dspace.org
-  # (NOTE: No deployment branch specified for sandbox.dspace.org as it uses the default_branch)
+  # Current DSpace branches (and architecture) which are deployed to demo.dspace.org & sandbox.dspace.org respectively
   DEPLOY_DEMO_BRANCH: 'dspace-9_x'
   DEPLOY_SANDBOX_BRANCH: 'main'
   DEPLOY_ARCH: 'linux/amd64'
@@ -165,7 +164,7 @@ jobs:
           # Use GitHub cache to load cached Docker images and cache the results of this build
           # This decreases the number of images we need to fetch from DockerHub
           cache-from: type=gha,scope=${{ inputs.build_id }}
-          cache-to: type=gha,scope=${{ inputs.build_id }},mode=max
+          cache-to: type=gha,scope=${{ inputs.build_id }},mode=min
 
       # Export the digest of Docker build locally
       - name: Export Docker build digest
@@ -217,7 +216,7 @@ jobs:
           # Use GitHub cache to load cached Docker images and cache the results of this build
           # This decreases the number of images we need to fetch from DockerHub
           cache-from: type=gha,scope=${{ inputs.build_id }}
-          cache-to: type=gha,scope=${{ inputs.build_id }},mode=max
+          cache-to: type=gha,scope=${{ inputs.build_id }},mode=min
           # Export image to a local TAR file
           outputs: type=docker,dest=/tmp/${{ inputs.build_id }}.tar
 

.lgtm.yml

@@ -1,9 +0,0 @@
-# LGTM Settings (https://lgtm.com/)
-# For reference, see https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-# or template at https://lgtm.com/static/downloads/lgtm.template.yml
-
-extraction:
-  java:
-    index:
-      # Specify the Java version required to build the project
-      java_version: 11

Dockerfile

@@ -1,13 +1,13 @@
 # This image will be published as dspace/dspace
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-7_x
+# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-8_x
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
 # The Docker version tag to build from
-ARG DSPACE_VERSION=dspace-7_x
+ARG DSPACE_VERSION=dspace-8_x
 # The Docker registry to use for DSpace images. Defaults to "docker.io"
 # NOTE: non-DSpace images are hardcoded to use "docker.io" and are not impacted by this build argument
 ARG DOCKER_REGISTRY=docker.io
@@ -23,7 +23,7 @@ RUN mkdir /install \
 USER dspace
 # Copy the DSpace source code (from local machine) into the workdir (excluding .dockerignore contents)
 ADD --chown=dspace . /app/
-# Build DSpace (note: this build doesn't include the optional, deprecated "dspace-rest" webapp)
+# Build DSpace
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
 # Maven flags here ensure that we skip building test environment and skip all code verification checks.
 # These flags speed up this compilation as much as reasonably possible.
@@ -31,6 +31,8 @@ ENV MAVEN_FLAGS="-P-test-environment -Denforcer.skip=true -Dcheckstyle.skip=true
 RUN mvn --no-transfer-progress package ${MAVEN_FLAGS} && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
+# Remove the server webapp to keep image small.
+RUN rm -rf /install/webapps/server/
 
 # Step 2 - Run Ant Deploy
 FROM docker.io/eclipse-temurin:${JDK_VERSION} AS ant_build
@@ -51,28 +53,21 @@ RUN mkdir $ANT_HOME && \
 # Run necessary 'ant' deploy scripts
 RUN ant init_installation update_configs update_code update_webapps
 
-# Step 3 - Run tomcat
-# Create a new tomcat image that does not retain the the build directory contents
-FROM docker.io/tomcat:9-jdk${JDK_VERSION}
+# Step 3 - Start up DSpace via Runnable JAR
+FROM docker.io/eclipse-temurin:${JDK_VERSION}
 # NOTE: DSPACE_INSTALL must align with the "dspace.dir" default configuration.
 ENV DSPACE_INSTALL=/dspace
 # Copy the /dspace directory from 'ant_build' container to /dspace in this container
 COPY --from=ant_build /dspace $DSPACE_INSTALL
+WORKDIR $DSPACE_INSTALL
 # Need host command for "[dspace]/bin/make-handle-config"
 RUN apt-get update \
     && apt-get install -y --no-install-recommends host \
     && apt-get purge -y --auto-remove \
     && rm -rf /var/lib/apt/lists/*
-# Expose Tomcat port (8080) and AJP port (8009) and Handle Server HTTP port (8000)
-EXPOSE 8080 8009 8000
+# Expose Tomcat port (8080) & Handle Server HTTP port (8000)
+EXPOSE 8080 8000
 # Give java extra memory (2GB)
 ENV JAVA_OPTS=-Xmx2000m
-
-# Link the DSpace 'server' webapp into Tomcat's webapps directory.
-# This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
-RUN ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/server
-# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
-# You also MUST update the 'dspace.server.url' configuration to match.
-# Please note that server webapp should only run on one path at a time.
-#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
-#    ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/ROOT
+# On startup, run DSpace Runnable JAR
+ENTRYPOINT ["java", "-jar", "webapps/server-boot.jar", "--dspace.dir=$DSPACE_INSTALL"]

Dockerfile.cli

@@ -1,13 +1,13 @@
 # This image will be published as dspace/dspace-cli
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:dspace-7_x
+# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:dspace-8_x
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
 # The Docker version tag to build from
-ARG DSPACE_VERSION=dspace-7_x
+ARG DSPACE_VERSION=dspace-8_x
 # The Docker registry to use for DSpace images. Defaults to "docker.io"
 # NOTE: non-DSpace images are hardcoded to use "docker.io" and are not impacted by this build argument
 ARG DOCKER_REGISTRY=docker.io

Dockerfile.dependencies

@@ -2,9 +2,9 @@
 # The purpose of this image is to make the build for dspace/dspace run faster
 #
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
 
 # Step 1 - Download all Dependencies
 FROM docker.io/maven:3-eclipse-temurin-${JDK_VERSION} AS build

Dockerfile.test

@@ -1,15 +1,15 @@
 # This image will be published as dspace/dspace
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-7_x-test
+# - note: default tag for branch: dspace/dspace: dspace/dspace:8_x-test
 #
 # This image is meant for TESTING/DEVELOPMENT ONLY as it deploys the old v6 REST API under HTTP (not HTTPS)
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
 # The Docker version tag to build from
-ARG DSPACE_VERSION=dspace-7_x
+ARG DSPACE_VERSION=dspace-8_x
 # The Docker registry to use for DSpace images. Defaults to "docker.io"
 # NOTE: non-DSpace images are hardcoded to use "docker.io" and are not impacted by this build argument
 ARG DOCKER_REGISTRY=docker.io
@@ -25,11 +25,13 @@ RUN mkdir /install \
 USER dspace
 # Copy the DSpace source code (from local machine) into the workdir (excluding .dockerignore contents)
 ADD --chown=dspace . /app/
-# Build DSpace (INCLUDING the optional, deprecated "dspace-rest" webapp)
+# Build DSpace
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
-RUN mvn --no-transfer-progress package -Pdspace-rest && \
+RUN mvn --no-transfer-progress package && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
+# Remove the server webapp to keep image small. Rename runnable JAR to server-boot.jar.
+RUN rm -rf /install/webapps/server/
 
 # Step 2 - Run Ant Deploy
 FROM docker.io/eclipse-temurin:${JDK_VERSION} AS ant_build
@@ -50,41 +52,23 @@ RUN mkdir $ANT_HOME && \
 # Run necessary 'ant' deploy scripts
 RUN ant init_installation update_configs update_code update_webapps
 
-# Step 3 - Run tomcat
-# Create a new tomcat image that does not retain the the build directory contents
-FROM docker.io/tomcat:9-jdk${JDK_VERSION}
+# Step 3 - Start up DSpace via Runnable JAR
+FROM docker.io/eclipse-temurin:${JDK_VERSION}
+# NOTE: DSPACE_INSTALL must align with the "dspace.dir" default configuration.
 ENV DSPACE_INSTALL=/dspace
-ENV TOMCAT_INSTALL=/usr/local/tomcat
-# Copy the /dspace directory from 'ant_build' containger to /dspace in this container
+# Copy the /dspace directory from 'ant_build' container to /dspace in this container
 COPY --from=ant_build /dspace $DSPACE_INSTALL
+WORKDIR $DSPACE_INSTALL
 # Need host command for "[dspace]/bin/make-handle-config"
 RUN apt-get update \
     && apt-get install -y --no-install-recommends host \
     && apt-get purge -y --auto-remove \
     && rm -rf /var/lib/apt/lists/*
-# Enable the AJP connector in Tomcat's server.xml
-# NOTE: secretRequired="false" should only be used when AJP is NOT accessible from an external network. But, secretRequired="true" isn't supported by mod_proxy_ajp until Apache 2.5
-RUN sed -i '/Service name="Catalina".*/a \\n    <Connector protocol="AJP/1.3" port="8009" address="0.0.0.0" redirectPort="8443" URIEncoding="UTF-8" secretRequired="false" />' $TOMCAT_INSTALL/conf/server.xml
-# Expose Tomcat port and AJP port
-EXPOSE 8080 8009 8000
+# Expose Tomcat port and debugging port
+EXPOSE 8080 8000
 # Give java extra memory (2GB)
 ENV JAVA_OPTS=-Xmx2000m
-# Set up debugging
-ENV CATALINA_OPTS=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:8000
-
-# Link the DSpace 'server' webapp into Tomcat's webapps directory.
-# This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
-# Also link the v6.x (deprecated) REST API off the "/rest" path
-RUN ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/server   && \
-    ln -s $DSPACE_INSTALL/webapps/rest          /usr/local/tomcat/webapps/rest
-# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
-# You also MUST update the 'dspace.server.url' configuration to match.
-# Please note that server webapp should only run on one path at a time.
-#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
-#    ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/ROOT && \
-#    ln -s $DSPACE_INSTALL/webapps/rest          /usr/local/tomcat/webapps/rest
-
-# Overwrite the v6.x (deprecated) REST API's web.xml, so that we can run it on HTTP (defaults to requiring HTTPS)
-# WARNING: THIS IS OBVIOUSLY INSECURE. NEVER DO THIS IN PRODUCTION.
-COPY dspace/src/main/docker/test/rest_web.xml $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
-RUN sed -i -e "s|\${dspace.dir}|$DSPACE_INSTALL|" $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
+# enable JVM debugging via JDWP
+ENV JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000
+# On startup, run DSpace Runnable JAR
+ENTRYPOINT ["java", "-jar", "webapps/server-boot.jar", "--dspace.dir=$DSPACE_INSTALL"]

LICENSES_THIRD_PARTY

@@ -25,6 +25,7 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * AWS Java SDK for AWS KMS (com.amazonaws:aws-java-sdk-kms:1.12.785 - https://aws.amazon.com/sdkforjava)
         * AWS Java SDK for Amazon S3 (com.amazonaws:aws-java-sdk-s3:1.12.785 - https://aws.amazon.com/sdkforjava)
         * JMES Path Query library (com.amazonaws:jmespath-java:1.12.785 - https://aws.amazon.com/sdkforjava)
+        * Titanium JSON-LD 1.1 (JRE11) (com.apicatalog:titanium-json-ld:1.3.2 - https://github.com/filip26/titanium-json-ld)
         * HPPC Collections (com.carrotsearch:hppc:0.8.1 - http://labs.carrotsearch.com/hppc.html/hppc)
         * com.drewnoakes:metadata-extractor (com.drewnoakes:metadata-extractor:2.19.0 - https://drewnoakes.com/code/exif/)
         * parso (com.epam:parso:2.0.14 - https://github.com/epam/parso)
@@ -35,15 +36,19 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.19.1 - https://github.com/FasterXML/jackson)
         * Jackson dataformat: CBOR (com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 - https://github.com/FasterXML/jackson-dataformats-binary)
         * Jackson dataformat: Smile (com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 - https://github.com/FasterXML/jackson-dataformats-binary)
-        * Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0 - https://github.com/FasterXML/jackson-dataformats-text)
-        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
-        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
-        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
-        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
+        * Jackson-dataformat-TOML (com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.15.2 - https://github.com/FasterXML/jackson-dataformats-text)
+        * Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.2 - https://github.com/FasterXML/jackson-dataformats-text)
+        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.19.1 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
+        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.1 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
+        * Jackson Jakarta-RS: base (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.16.2 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-base)
+        * Jackson Jakarta-RS: JSON (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.16.2 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-json-provider)
+        * Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) (com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.2 - https://github.com/FasterXML/jackson-modules-base)
+        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.19.1 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
         * Java UUID Generator (com.fasterxml.uuid:java-uuid-generator:4.1.0 - https://github.com/cowtowncoder/java-uuid-generator)
         * Woodstox (com.fasterxml.woodstox:woodstox-core:6.5.1 - https://github.com/FasterXML/woodstox)
         * zjsonpatch (com.flipkart.zjsonpatch:zjsonpatch:0.4.16 - https://github.com/flipkart-incubator/zjsonpatch/)
         * Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.3 - https://github.com/ben-manes/caffeine)
+        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:3.1.8 - https://github.com/ben-manes/caffeine)
         * JSON.simple (com.github.cliftonlabs:json-simple:3.0.2 - https://cliftonlabs.github.io/json-simple/)
         * btf (com.github.java-json-tools:btf:1.3 - https://github.com/java-json-tools/btf)
         * jackson-coreutils (com.github.java-json-tools:jackson-coreutils:2.0 - https://github.com/java-json-tools/jackson-coreutils)
@@ -54,22 +59,14 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * msg-simple (com.github.java-json-tools:msg-simple:1.2 - https://github.com/java-json-tools/msg-simple)
         * uri-template (com.github.java-json-tools:uri-template:0.10 - https://github.com/java-json-tools/uri-template)
         * JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations)
-        * Google APIs Client Library for Java (com.google.api-client:google-api-client:1.35.2 - https://github.com/googleapis/google-api-java-client/google-api-client)
-        * Google Analytics API v3-rev145-1.23.0 (com.google.apis:google-api-services-analytics:v3-rev145-1.23.0 - http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-analytics)
         * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
-        * Gson (com.google.code.gson:gson:2.11.0 - https://github.com/google/gson)
-        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.21.1 - https://errorprone.info/error_prone_annotations)
+        * Gson (com.google.code.gson:gson:2.13.1 - https://github.com/google/gson)
+        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.38.0 - https://errorprone.info/error_prone_annotations)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
         * Guava: Google Core Libraries for Java (com.google.guava:guava:32.1.3-jre - https://github.com/google/guava)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
-        * Google HTTP Client Library for Java (com.google.http-client:google-http-client:1.47.0 - https://github.com/googleapis/google-http-java-client/google-http-client)
-        * Apache HTTP transport v2 for the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-apache-v2:1.42.0 - https://github.com/googleapis/google-http-java-client/google-http-client-apache-v2)
-        * GSON extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-gson:1.47.0 - https://github.com/googleapis/google-http-java-client/google-http-client-gson)
-        * Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.47.0 - https://github.com/googleapis/google-http-java-client/google-http-client-jackson2)
         * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
         * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:2.8 - https://github.com/google/j2objc/)
-        * Google OAuth Client Library for Java (com.google.oauth-client:google-oauth-client:1.39.0 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client)
-        * ConcurrentLinkedHashMap (com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2 - http://code.google.com/p/concurrentlinkedhashmap)
         * libphonenumber (com.googlecode.libphonenumber:libphonenumber:8.11.1 - https://github.com/google/libphonenumber/)
         * Jackcess (com.healthmarketscience.jackcess:jackcess:4.0.8 - https://jackcess.sourceforge.io)
         * Jackcess Encrypt (com.healthmarketscience.jackcess:jackcess-encrypt:4.0.3 - http://jackcessencrypt.sf.net)
@@ -79,8 +76,8 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * MaxMind DB Reader (com.maxmind.db:maxmind-db:2.1.0 - http://dev.maxmind.com/)
         * MaxMind GeoIP2 API (com.maxmind.geoip2:geoip2:2.17.0 - https://dev.maxmind.com/geoip?lang=en)
         * JsonSchemaValidator (com.networknt:json-schema-validator:1.0.76 - https://github.com/networknt/json-schema-validator)
-        * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
         * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.28 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
+        * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.48 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
         * opencsv (com.opencsv:opencsv:5.11.1 - http://opencsv.sf.net)
         * java-libpst (com.pff:java-libpst:0.9.3 - https://github.com/rjohnsondev/java-libpst)
         * rome (com.rometools:rome:1.19.0 - http://rometools.com/rome)
@@ -107,48 +104,38 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Commons Codec (commons-codec:commons-codec:1.18.0 - https://commons.apache.org/proper/commons-codec/)
         * Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/)
         * Commons Digester (commons-digester:commons-digester:2.1 - http://commons.apache.org/digester/)
-        * Commons FileUpload (commons-fileupload:commons-fileupload:1.2.1 - http://commons.apache.org/fileupload/)
         * Apache Commons IO (commons-io:commons-io:2.19.0 - https://commons.apache.org/proper/commons-io/)
         * Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/)
         * Apache Commons Logging (commons-logging:commons-logging:1.3.5 - https://commons.apache.org/proper/commons-logging/)
         * Apache Commons Validator (commons-validator:commons-validator:1.9.0 - http://commons.apache.org/proper/commons-validator/)
         * GeoJson POJOs for Jackson (de.grundid.opendatalab:geojson-jackson:1.14 - https://github.com/opendatalab-de/geojson-jackson)
+        * broker-client (eu.openaire:broker-client:1.1.2 - http://api.openaire.eu/broker/broker-client)
         * OpenAIRE Funders Model (eu.openaire:funders-model:2.0.0 - https://api.openaire.eu)
         * Metrics Core (io.dropwizard.metrics:metrics-core:4.1.5 - https://metrics.dropwizard.io/metrics-core)
         * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.1.5 - https://metrics.dropwizard.io/metrics-graphite)
         * Metrics Integration for Jetty 9.3 and higher (io.dropwizard.metrics:metrics-jetty9:4.1.5 - https://metrics.dropwizard.io/metrics-jetty9)
         * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.1.5 - https://metrics.dropwizard.io/metrics-jmx)
         * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.1.5 - https://metrics.dropwizard.io/metrics-jvm)
-        * io.grpc:grpc-api (io.grpc:grpc-api:1.73.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-context (io.grpc:grpc-context:1.73.0 - https://github.com/grpc/grpc-java)
-        * micrometer-core (io.micrometer:micrometer-core:1.9.17 - https://github.com/micrometer-metrics/micrometer)
+        * SWORD v2 Common Server Library (forked) (io.gdcc:sword2-server:2.0.0 - https://github.com/gdcc/sword2-server)
+        * micrometer-commons (io.micrometer:micrometer-commons:1.14.8 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-core (io.micrometer:micrometer-core:1.15.1 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-jakarta9 (io.micrometer:micrometer-jakarta9:1.15.1 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-observation (io.micrometer:micrometer-observation:1.14.8 - https://github.com/micrometer-metrics/micrometer)
         * Netty/Buffer (io.netty:netty-buffer:4.1.99.Final - https://netty.io/netty-buffer/)
-        * Netty/Buffer (io.netty:netty-buffer:4.2.2.Final - https://netty.io/netty-buffer/)
         * Netty/Codec (io.netty:netty-codec:4.1.99.Final - https://netty.io/netty-codec/)
-        * Netty/Codec (io.netty:netty-codec:4.2.2.Final - https://netty.io/netty-codec/)
-        * Netty/Codec/Base (io.netty:netty-codec-base:4.2.2.Final - https://netty.io/netty-codec-base/)
-        * Netty/Codec/Compression (io.netty:netty-codec-compression:4.2.2.Final - https://netty.io/netty-codec-compression/)
         * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.86.Final - https://netty.io/netty-codec-http/)
         * Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.86.Final - https://netty.io/netty-codec-http2/)
-        * Netty/Codec/Marshalling (io.netty:netty-codec-marshalling:4.2.2.Final - https://netty.io/netty-codec-marshalling/)
-        * Netty/Codec/Protobuf (io.netty:netty-codec-protobuf:4.2.2.Final - https://netty.io/netty-codec-protobuf/)
         * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.86.Final - https://netty.io/netty-codec-socks/)
         * Netty/Common (io.netty:netty-common:4.1.99.Final - https://netty.io/netty-common/)
-        * Netty/Common (io.netty:netty-common:4.2.2.Final - https://netty.io/netty-common/)
         * Netty/Handler (io.netty:netty-handler:4.1.99.Final - https://netty.io/netty-handler/)
-        * Netty/Handler (io.netty:netty-handler:4.2.2.Final - https://netty.io/netty-handler/)
         * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.86.Final - https://netty.io/netty-handler-proxy/)
         * Netty/Resolver (io.netty:netty-resolver:4.1.99.Final - https://netty.io/netty-resolver/)
         * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.56.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/)
         * Netty/TomcatNative [OpenSSL - Classes] (io.netty:netty-tcnative-classes:2.0.56.Final - https://github.com/netty/netty-tcnative/netty-tcnative-classes/)
         * Netty/Transport (io.netty:netty-transport:4.1.99.Final - https://netty.io/netty-transport/)
-        * Netty/Transport (io.netty:netty-transport:4.2.2.Final - https://netty.io/netty-transport/)
         * Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.99.Final - https://netty.io/netty-transport-classes-epoll/)
         * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.99.Final - https://netty.io/netty-transport-native-epoll/)
         * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.99.Final - https://netty.io/netty-transport-native-unix-common/)
-        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.2.2.Final - https://netty.io/netty-transport-native-unix-common/)
-        * OpenCensus (io.opencensus:opencensus-api:0.31.1 - https://github.com/census-instrumentation/opencensus-java)
-        * OpenCensus (io.opencensus:opencensus-contrib-http-util:0.31.1 - https://github.com/census-instrumentation/opencensus-java)
         * OpenTracing API (io.opentracing:opentracing-api:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-api)
         * OpenTracing-noop (io.opentracing:opentracing-noop:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-noop)
         * OpenTracing-util (io.opentracing:opentracing-util:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-util)
@@ -159,25 +146,31 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Prometheus Java Span Context Supplier - OpenTelemetry (io.prometheus:simpleclient_tracer_otel:0.16.0 - http://github.com/prometheus/client_java/simpleclient_tracer/simpleclient_tracer_otel)
         * Prometheus Java Span Context Supplier - OpenTelemetry Agent (io.prometheus:simpleclient_tracer_otel_agent:0.16.0 - http://github.com/prometheus/client_java/simpleclient_tracer/simpleclient_tracer_otel_agent)
         * Google S2 geometry library (io.sgr:s2-geometry-library-java:1.0.0 - https://github.com/sgr-io/s2-geometry-library-java)
+        * Jandex: Core (io.smallrye:jandex:3.1.2 - https://smallrye.io)
         * swagger-annotations (io.swagger:swagger-annotations:1.6.9 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
         * swagger-compat-spec-parser (io.swagger:swagger-compat-spec-parser:1.0.64 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-compat-spec-parser)
         * swagger-core (io.swagger:swagger-core:1.6.9 - https://github.com/swagger-api/swagger-core/modules/swagger-core)
         * swagger-models (io.swagger:swagger-models:1.6.9 - https://github.com/swagger-api/swagger-core/modules/swagger-models)
         * swagger-parser (io.swagger:swagger-parser:1.0.64 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser)
         * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.8 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+        * swagger-annotations-jakarta (io.swagger.core.v3:swagger-annotations-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations-jakarta)
         * swagger-core (io.swagger.core.v3:swagger-core:2.2.8 - https://github.com/swagger-api/swagger-core/modules/swagger-core)
+        * swagger-core-jakarta (io.swagger.core.v3:swagger-core-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-core-jakarta)
+        * swagger-integration-jakarta (io.swagger.core.v3:swagger-integration-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-integration-jakarta)
+        * swagger-jaxrs2-jakarta (io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-jaxrs2-jakarta)
         * swagger-models (io.swagger.core.v3:swagger-models:2.2.8 - https://github.com/swagger-api/swagger-core/modules/swagger-models)
+        * swagger-models-jakarta (io.swagger.core.v3:swagger-models-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-models-jakarta)
         * swagger-parser (io.swagger.parser.v3:swagger-parser:2.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser)
         * swagger-parser (io.swagger.parser.v3:swagger-parser-core:2.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-core)
         * swagger-parser-v2-converter (io.swagger.parser.v3:swagger-parser-v2-converter:2.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-v2-converter)
         * swagger-parser-v3 (io.swagger.parser.v3:swagger-parser-v3:2.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-v3)
-        * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:2.0.2 - https://beanvalidation.org)
+        * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1 - https://github.com/eclipse-ee4j/injection-api)
+        * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:3.0.2 - https://beanvalidation.org)
         * JSR107 API and SPI (javax.cache:cache-api:1.1.1 - https://github.com/jsr107/jsr107spec)
-        * javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
         * jdbm (jdbm:jdbm:1.0 - no url defined)
-        * Joda-Time (joda-time:joda-time:2.14.0 - https://www.joda.org/joda-time/)
+        * Joda-Time (joda-time:joda-time:2.12.7 - https://www.joda.org/joda-time/)
         * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.11.13 - https://bytebuddy.net/byte-buddy)
-        * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.18 - https://bytebuddy.net/byte-buddy)
+        * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.14.11 - https://bytebuddy.net/byte-buddy)
         * Byte Buddy agent (net.bytebuddy:byte-buddy-agent:1.11.13 - https://bytebuddy.net/byte-buddy-agent)
         * eigenbase-properties (net.hydromatic:eigenbase-properties:1.1.5 - http://github.com/julianhyde/eigenbase-properties)
         * json-unit-core (net.javacrumbs.json-unit:json-unit-core:2.36.0 - https://github.com/lukas-krecan/JsonUnit/json-unit-core)
@@ -188,6 +181,7 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * JSON Small and Fast Parser (net.minidev:json-smart:2.5.2 - https://urielch.github.io/)
         * Abdera Core (org.apache.abdera:abdera-core:1.1.3 - http://abdera.apache.org/abdera-core)
         * I18N Libraries (org.apache.abdera:abdera-i18n:1.1.3 - http://abdera.apache.org)
+        * Abdera Parser (org.apache.abdera:abdera-parser:1.1.3 - http://abdera.apache.org/abdera-parser)
         * Apache Ant Core (org.apache.ant:ant:1.10.15 - https://ant.apache.org/)
         * Apache Ant Launcher (org.apache.ant:ant-launcher:1.10.15 - https://ant.apache.org/)
         * Apache Commons BCEL (org.apache.bcel:bcel:6.10.0 - https://commons.apache.org/proper/commons-bcel)
@@ -216,29 +210,44 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.2.4 - no url defined)
         * htrace-core4 (org.apache.htrace:htrace-core4:4.1.0-incubating - http://incubator.apache.org/projects/htrace.html)
         * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
-        * Apache HttpClient Cache (org.apache.httpcomponents:httpclient-cache:4.2.6 - http://hc.apache.org/httpcomponents-client)
+        * Apache HttpClient Cache (org.apache.httpcomponents:httpclient-cache:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
         * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.16 - http://hc.apache.org/httpcomponents-core-ga)
         * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
         * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.1.3 - https://hc.apache.org/httpcomponents-client-5.0.x/5.1.3/httpclient5/)
+        * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.5 - https://hc.apache.org/httpcomponents-client-5.5.x/5.5/httpclient5/)
         * Apache HttpComponents Core HTTP/1.1 (org.apache.httpcomponents.core5:httpcore5:5.1.3 - https://hc.apache.org/httpcomponents-core-5.1.x/5.1.3/httpcore5/)
+        * Apache HttpComponents Core HTTP/1.1 (org.apache.httpcomponents.core5:httpcore5:5.3.4 - https://hc.apache.org/httpcomponents-core-5.3.x/5.3.4/httpcore5/)
         * Apache HttpComponents Core HTTP/2 (org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 - https://hc.apache.org/httpcomponents-core-5.1.x/5.1.3/httpcore5-h2/)
+        * Apache HttpComponents Core HTTP/2 (org.apache.httpcomponents.core5:httpcore5-h2:5.3.4 - https://hc.apache.org/httpcomponents-core-5.3.x/5.3.4/httpcore5-h2/)
         * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.12 - http://james.apache.org/mime4j/apache-mime4j-core)
         * Apache James :: Mime4j :: DOM (org.apache.james:apache-mime4j-dom:0.8.12 - http://james.apache.org/mime4j/apache-mime4j-dom)
-        * Apache Jena - Libraries POM (org.apache.jena:apache-jena-libs:2.13.0 - http://jena.apache.org/apache-jena-libs/)
-        * Apache Jena - ARQ (SPARQL 1.1 Query Engine) (org.apache.jena:jena-arq:2.13.0 - http://jena.apache.org/jena-arq/)
-        * Apache Jena - Core (org.apache.jena:jena-core:2.13.0 - http://jena.apache.org/jena-core/)
-        * Apache Jena - IRI (org.apache.jena:jena-iri:1.1.2 - http://jena.apache.org/jena-iri/)
-        * Apache Jena - TDB (Native Triple Store) (org.apache.jena:jena-tdb:1.1.2 - http://jena.apache.org/jena-tdb/)
+        * Apache Jena - Libraries POM (org.apache.jena:apache-jena-libs:4.10.0 - https://jena.apache.org/apache-jena-libs/)
+        * Apache Jena - ARQ (org.apache.jena:jena-arq:4.10.0 - https://jena.apache.org/jena-arq/)
+        * Apache Jena - Base (org.apache.jena:jena-base:4.10.0 - https://jena.apache.org/jena-base/)
+        * Apache Jena - Core (org.apache.jena:jena-core:4.10.0 - https://jena.apache.org/jena-core/)
+        * Apache Jena - DBOE Base (org.apache.jena:jena-dboe-base:4.10.0 - https://jena.apache.org/jena-dboe-base/)
+        * Apache Jena - DBOE Indexes (org.apache.jena:jena-dboe-index:4.10.0 - https://jena.apache.org/jena-dboe-index/)
+        * Apache Jena - DBOE Storage (org.apache.jena:jena-dboe-storage:4.10.0 - https://jena.apache.org/jena-dboe-storage/)
+        * Apache Jena - DBOE Transactional Datastructures (org.apache.jena:jena-dboe-trans-data:4.10.0 - https://jena.apache.org/jena-dboe-trans-data/)
+        * Apache Jena - DBOE Transactions (org.apache.jena:jena-dboe-transaction:4.10.0 - https://jena.apache.org/jena-dboe-transaction/)
+        * Apache Jena - IRI (org.apache.jena:jena-iri:4.10.0 - https://jena.apache.org/jena-iri/)
+        * Apache Jena - RDF Connection (org.apache.jena:jena-rdfconnection:4.10.0 - https://jena.apache.org/jena-rdfconnection/)
+        * Apache Jena - RDF Patch (org.apache.jena:jena-rdfpatch:4.10.0 - https://jena.apache.org/jena-rdfpatch/)
+        * Apache Jena - SHACL (org.apache.jena:jena-shacl:4.10.0 - https://jena.apache.org/jena-shacl/)
+        * Apache Jena - ShEx (org.apache.jena:jena-shex:4.10.0 - https://jena.apache.org/jena-shex/)
+        * Apache Jena - TDB1 (Native Triple Store) (org.apache.jena:jena-tdb:4.10.0 - https://jena.apache.org/jena-tdb/)
+        * Apache Jena - TDB2 (Native Triple Store) (org.apache.jena:jena-tdb2:4.10.0 - https://jena.apache.org/jena-tdb2/)
         * Kerby-kerb core (org.apache.kerby:kerb-core:1.0.1 - http://directory.apache.org/kerby/kerby-kerb/kerb-core)
         * Kerby-kerb Util (org.apache.kerby:kerb-util:1.0.1 - http://directory.apache.org/kerby/kerby-kerb/kerb-util)
         * Kerby ASN1 Project (org.apache.kerby:kerby-asn1:1.0.1 - http://directory.apache.org/kerby/kerby-common/kerby-asn1)
         * Kerby PKIX Project (org.apache.kerby:kerby-pkix:1.0.1 - http://directory.apache.org/kerby/kerby-pkix)
-        * Apache Log4j 1.x Compatibility API (org.apache.logging.log4j:log4j-1.2-api:2.25.1 - https://logging.apache.org/log4j/2.x/)
-        * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.25.1 - https://logging.apache.org/log4j/2.x/)
-        * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.25.1 - https://logging.apache.org/log4j/2.x/)
-        * Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-jul/)
+        * Apache Log4j 1.x Compatibility API (org.apache.logging.log4j:log4j-1.2-api:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-1.2-api/)
+        * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-api/)
+        * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-core/)
+        * Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-jul/)
         * Apache Log4j Layout for JSON template (org.apache.logging.log4j:log4j-layout-template-json:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-layout-template-json/)
         * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/)
+        * SLF4J 2 Provider for Log4j API (org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j2-impl/)
         * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-web/)
         * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.11.4 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common)
         * Lucene ICU Analysis Components (org.apache.lucene:lucene-analyzers-icu:8.11.4 - https://lucene.apache.org/lucene-parent/lucene-analyzers-icu)
@@ -277,7 +286,7 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Solr Solrj (org.apache.solr:solr-solrj:8.11.4 - https://lucene.apache.org/solr-parent/solr-solrj)
         * Apache Standard Taglib Implementation (org.apache.taglibs:taglibs-standard-impl:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-impl)
         * Apache Standard Taglib Specification API (org.apache.taglibs:taglibs-standard-spec:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-spec)
-        * Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org)
+        * Apache Thrift (org.apache.thrift:libthrift:0.19.0 - http://thrift.apache.org)
         * Apache Tika core (org.apache.tika:tika-core:2.9.4 - https://tika.apache.org/)
         * Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:2.9.4 - https://tika.apache.org/tika-parser-apple-module/)
         * Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:2.9.4 - https://tika.apache.org/tika-parser-audiovideo-module/)
@@ -302,35 +311,39 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Tika XMP commons (org.apache.tika:tika-parser-xmp-commons:2.9.4 - https://tika.apache.org/tika-parser-xmp-commons/)
         * Apache Tika ZIP commons (org.apache.tika:tika-parser-zip-commons:2.9.4 - https://tika.apache.org/tika-parser-zip-commons/)
         * Apache Tika standard parser package (org.apache.tika:tika-parsers-standard-package:2.9.4 - https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
-        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.83 - https://tomcat.apache.org/)
-        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.83 - https://tomcat.apache.org/)
-        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83 - https://tomcat.apache.org/)
+        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:10.1.42 - https://tomcat.apache.org/)
+        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:10.1.42 - https://tomcat.apache.org/)
+        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:10.1.42 - https://tomcat.apache.org/)
         * Apache Velocity - Engine (org.apache.velocity:velocity-engine-core:2.4.1 - http://velocity.apache.org/engine/devel/velocity-engine-core/)
         * Apache Velocity - JSR 223 Scripting (org.apache.velocity:velocity-engine-scripting:2.3 - http://velocity.apache.org/engine/devel/velocity-engine-scripting/)
         * Apache Velocity Tools - Generic tools (org.apache.velocity.tools:velocity-tools-generic:3.1 - https://velocity.apache.org/tools/devel/velocity-tools-generic/)
-        * Axiom API (org.apache.ws.commons.axiom:axiom-api:1.2.22 - http://ws.apache.org/axiom/)
-        * Abdera Model (FOM) Implementation (org.apache.ws.commons.axiom:fom-impl:1.2.22 - http://ws.apache.org/axiom/implementations/fom-impl/)
+        * Axiom API (org.apache.ws.commons.axiom:axiom-api:1.2.14 - http://ws.apache.org/axiom/)
+        * Axiom Impl (org.apache.ws.commons.axiom:axiom-impl:1.2.14 - http://ws.apache.org/axiom/)
         * XmlBeans (org.apache.xmlbeans:xmlbeans:5.3.0 - https://xmlbeans.apache.org/)
         * Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.6.2 - http://zookeeper.apache.org/zookeeper)
         * Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.6.2 - http://zookeeper.apache.org/zookeeper-jute)
         * org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.2 - https://github.com/apiguardian-team/apiguardian)
-        * AssertJ fluent assertions (org.assertj:assertj-core:3.22.0 - https://assertj.github.io/doc/assertj-core/)
+        * AssertJ Core (org.assertj:assertj-core:3.27.3 - https://assertj.github.io/doc/#assertj-core)
         * Evo Inflector (org.atteo:evo-inflector:1.3 - http://atteo.org/static/evo-inflector)
+        * attoparser (org.attoparser:attoparser:2.0.7.RELEASE - https://www.attoparser.org)
+        * Awaitility (org.awaitility:awaitility:4.2.2 - http://awaitility.org)
         * jose4j (org.bitbucket.b_c:jose4j:0.6.5 - https://bitbucket.org/b_c/jose4j/)
         * TagSoup (org.ccil.cowan.tagsoup:tagsoup:1.2.1 - http://home.ccil.org/~cowan/XML/tagsoup/)
+        * Woodstox (org.codehaus.woodstox:wstx-asl:3.2.6 - http://woodstox.codehaus.org)
         * jems (org.dmfs:jems:1.18 - https://github.com/dmfs/jems)
         * rfc3986-uri (org.dmfs:rfc3986-uri:0.8.1 - https://github.com/dmfs/uri-toolkit)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
         * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
         * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.57.v20241219 - https://jetty.org/jetty-alpn-parent/jetty-alpn-java-server/)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.57.v20241219 - https://jetty.org/jetty-alpn-parent/jetty-alpn-server/)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.57.v20241219 - https://jetty.org/jetty-continuation/)
         * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.57.v20241219 - https://jetty.org/jetty-deploy/)
         * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.57.v20241219 - https://jetty.org/jetty-http/)
         * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.57.v20241219 - https://jetty.org/jetty-io/)
@@ -342,31 +355,36 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.57.v20241219 - https://jetty.org/jetty-security/)
         * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.57.v20241219 - https://jetty.org/jetty-server/)
         * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.57.v20241219 - https://jetty.org/jetty-servlet/)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.57.v20241219 - https://jetty.org/jetty-servlets/)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlets)
         * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.57.v20241219 - https://jetty.org/jetty-util/)
         * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.57.v20241219 - https://jetty.org/jetty-util-ajax/)
         * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.57.v20241219 - https://jetty.org/jetty-webapp/)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-xml)
         * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.57.v20241219 - https://jetty.org/jetty-xml/)
+        * Jetty :: ALPN :: API (org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 - http://www.eclipse.org/jetty/alpn-api)
         * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-client)
         * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.57.v20241219 - https://jetty.org/http2-parent/http2-common/)
         * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-hpack)
         * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.57.v20241219 - https://jetty.org/http2-parent/http2-server/)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.15.v20190215 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
         * Ehcache (org.ehcache:ehcache:3.10.8 - http://ehcache.org)
-        * flyway-core (org.flywaydb:flyway-core:8.5.13 - https://flywaydb.org/flyway-core)
+        * flyway-core (org.flywaydb:flyway-core:10.22.0 - https://flywaydb.org/flyway-core)
+        * flyway-database-postgresql (org.flywaydb:flyway-database-postgresql:10.22.0 - https://flywaydb.org/flyway-database-postgresql)
         * Ogg and Vorbis for Java, Core (org.gagravarr:vorbis-java-core:0.8 - https://github.com/Gagravarr/VorbisJava)
         * Apache Tika plugin for Ogg, Vorbis and FLAC (org.gagravarr:vorbis-java-tika:0.8 - https://github.com/Gagravarr/VorbisJava)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.2.5.Final - http://hibernate.org/validator/hibernate-validator)
-        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:6.2.5.Final - http://hibernate.org/validator/hibernate-validator-cdi)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
+        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:8.0.2.Final - http://hibernate.org/validator/hibernate-validator)
+        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:8.0.2.Final - http://hibernate.org/validator/hibernate-validator-cdi)
         * org.immutables.value-annotations (org.immutables:value-annotations:2.9.2 - http://immutables.org/value-annotations)
         * leveldb (org.iq80.leveldb:leveldb:0.12 - http://github.com/dain/leveldb/leveldb)
         * leveldb-api (org.iq80.leveldb:leveldb-api:0.12 - http://github.com/dain/leveldb/leveldb-api)
         * Javassist (org.javassist:javassist:3.30.2-GA - https://www.javassist.org/)
-        * Java Annotation Indexer (org.jboss:jandex:2.4.2.Final - http://www.jboss.org/jandex)
         * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.6.1.Final - http://www.jboss.org)
         * JDOM (org.jdom:jdom2:2.0.6.1 - http://www.jdom.org)
         * IntelliJ IDEA Annotations (org.jetbrains:annotations:13.0 - http://www.jetbrains.org)
@@ -374,121 +392,105 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Kotlin Stdlib Common (org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21 - https://kotlinlang.org/)
         * Kotlin Stdlib Jdk7 (org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21 - https://kotlinlang.org/)
         * Kotlin Stdlib Jdk8 (org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 - https://kotlinlang.org/)
-        * jtwig-core (org.jtwig:jtwig-core:5.87.0.RELEASE - http://jtwig.org)
-        * jtwig-reflection (org.jtwig:jtwig-reflection:5.87.0.RELEASE - http://jtwig.org)
-        * jtwig-spring (org.jtwig:jtwig-spring:5.87.0.RELEASE - http://jtwig.org)
-        * jtwig-spring-boot-starter (org.jtwig:jtwig-spring-boot-starter:5.87.0.RELEASE - http://jtwig.org)
-        * jtwig-web (org.jtwig:jtwig-web:5.87.0.RELEASE - http://jtwig.org)
         * Proj4J (org.locationtech.proj4j:proj4j:1.1.5 - https://github.com/locationtech/proj4j)
         * Spatial4J (org.locationtech.spatial4j:spatial4j:0.7 - https://projects.eclipse.org/projects/locationtech.spatial4j)
         * MockServer Java Client (org.mock-server:mockserver-client-java:5.15.0 - https://www.mock-server.com)
         * MockServer Core (org.mock-server:mockserver-core:5.15.0 - https://www.mock-server.com)
         * MockServer JUnit 4 Integration (org.mock-server:mockserver-junit-rule:5.15.0 - https://www.mock-server.com)
         * MockServer & Proxy Netty (org.mock-server:mockserver-netty:5.15.0 - https://www.mock-server.com)
-        * MortBay :: Apache EL :: API and Implementation (org.mortbay.jasper:apache-el:8.5.35.1 - https://github.com/jetty-project/jasper-jsp/apache-el)
-        * MortBay :: Apache Jasper :: JSP Implementation (org.mortbay.jasper:apache-jsp:8.5.35.1 - https://github.com/jetty-project/jasper-jsp/apache-jsp)
-        * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
-        * Jetty Servlet Tester (org.mortbay.jetty:jetty-servlet-tester:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-servlet-tester)
-        * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
-        * Servlet Specification API (org.mortbay.jetty:servlet-api:2.5-20081211 - http://jetty.mortbay.org/servlet-api)
         * jwarc (org.netpreserve:jwarc:0.31.1 - https://github.com/iipc/jwarc)
         * Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis)
         * org.opentest4j:opentest4j (org.opentest4j:opentest4j:1.3.0 - https://github.com/ota4j-team/opentest4j)
-        * parboiled-core (org.parboiled:parboiled-core:1.1.7 - http://parboiled.org)
-        * parboiled-java (org.parboiled:parboiled-java:1.1.7 - http://parboiled.org)
+        * org.roaringbitmap:RoaringBitmap (org.roaringbitmap:RoaringBitmap:1.0.0 - https://github.com/RoaringBitmap/RoaringBitmap)
         * RRD4J (org.rrd4j:rrd4j:3.5 - https://github.com/rrd4j/rrd4j/)
-        * Scala Library (org.scala-lang:scala-library:2.13.16 - https://www.scala-lang.org/)
+        * Scala Library (org.scala-lang:scala-library:2.13.2 - https://www.scala-lang.org/)
         * Scala Compiler (org.scala-lang:scala-reflect:2.13.0 - https://www.scala-lang.org/)
         * scala-collection-compat (org.scala-lang.modules:scala-collection-compat_2.13:2.1.6 - http://www.scala-lang.org/)
         * scala-java8-compat (org.scala-lang.modules:scala-java8-compat_2.13:0.9.0 - http://www.scala-lang.org/)
         * scala-parser-combinators (org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2 - http://www.scala-lang.org/)
         * scala-xml (org.scala-lang.modules:scala-xml_2.13:1.3.0 - http://www.scala-lang.org/)
-        * JSONassert (org.skyscreamer:jsonassert:1.5.1 - https://github.com/skyscreamer/JSONassert)
-        * JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.36 - http://www.slf4j.org)
-        * Spring AOP (org.springframework:spring-aop:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Beans (org.springframework:spring-beans:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Context (org.springframework:spring-context:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Context Support (org.springframework:spring-context-support:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Core (org.springframework:spring-core:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Expression Language (SpEL) (org.springframework:spring-expression:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Commons Logging Bridge (org.springframework:spring-jcl:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring JDBC (org.springframework:spring-jdbc:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Object/Relational Mapping (org.springframework:spring-orm:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring TestContext Framework (org.springframework:spring-test:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Transaction (org.springframework:spring-tx:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Web (org.springframework:spring-web:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * Spring Web MVC (org.springframework:spring-webmvc:5.3.39 - https://github.com/spring-projects/spring-framework)
-        * spring-boot (org.springframework.boot:spring-boot:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-actuator (org.springframework.boot:spring-boot-actuator:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-actuator-autoconfigure (org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:2.7.18 - https://spring.io/projects/spring-boot)
-        * Spring Boot Configuration Processor (org.springframework.boot:spring-boot-configuration-processor:2.0.0.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-tools/spring-boot-configuration-processor)
-        * spring-boot-starter (org.springframework.boot:spring-boot-starter:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-aop (org.springframework.boot:spring-boot-starter-aop:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-cache (org.springframework.boot:spring-boot-starter-cache:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-data-rest (org.springframework.boot:spring-boot-starter-data-rest:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-log4j2 (org.springframework.boot:spring-boot-starter-log4j2:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-test (org.springframework.boot:spring-boot-test:2.7.18 - https://spring.io/projects/spring-boot)
-        * spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:2.7.18 - https://spring.io/projects/spring-boot)
-        * Spring Data Core (org.springframework.data:spring-data-commons:2.7.18 - https://www.spring.io/spring-data/spring-data-commons)
-        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:3.7.18 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
-        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:3.7.18 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
-        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:1.5.6 - https://github.com/spring-projects/spring-hateoas)
-        * Spring Plugin - Core (org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - https://github.com/spring-projects/spring-plugin/spring-plugin-core)
-        * spring-security-config (org.springframework.security:spring-security-config:5.7.11 - https://spring.io/projects/spring-security)
-        * spring-security-config (org.springframework.security:spring-security-config:5.7.14 - https://spring.io/projects/spring-security)
-        * spring-security-core (org.springframework.security:spring-security-core:5.7.11 - https://spring.io/projects/spring-security)
-        * spring-security-core (org.springframework.security:spring-security-core:5.7.14 - https://spring.io/projects/spring-security)
-        * spring-security-crypto (org.springframework.security:spring-security-crypto:5.7.11 - https://spring.io/projects/spring-security)
-        * spring-security-crypto (org.springframework.security:spring-security-crypto:5.7.14 - https://spring.io/projects/spring-security)
-        * spring-security-test (org.springframework.security:spring-security-test:5.7.14 - https://spring.io/projects/spring-security)
-        * spring-security-web (org.springframework.security:spring-security-web:5.7.11 - https://spring.io/projects/spring-security)
-        * spring-security-web (org.springframework.security:spring-security-web:5.7.14 - https://spring.io/projects/spring-security)
-        * SWORD v2 :: Common Server Library (org.swordapp:sword2-server:1.0 - http://www.swordapp.org/)
+        * JSONassert (org.skyscreamer:jsonassert:1.5.3 - https://github.com/skyscreamer/JSONassert)
+        * JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:2.0.17 - http://www.slf4j.org)
+        * Spring AOP (org.springframework:spring-aop:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Beans (org.springframework:spring-beans:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Context (org.springframework:spring-context:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Context Support (org.springframework:spring-context-support:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Core (org.springframework:spring-core:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Expression Language (SpEL) (org.springframework:spring-expression:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Commons Logging Bridge (org.springframework:spring-jcl:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring JDBC (org.springframework:spring-jdbc:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Object/Relational Mapping (org.springframework:spring-orm:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring TestContext Framework (org.springframework:spring-test:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Transaction (org.springframework:spring-tx:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Web (org.springframework:spring-web:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Web MVC (org.springframework:spring-webmvc:6.2.8 - https://github.com/spring-projects/spring-framework)
+        * spring-boot (org.springframework.boot:spring-boot:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator (org.springframework.boot:spring-boot-actuator:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator-autoconfigure (org.springframework.boot:spring-boot-actuator-autoconfigure:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter (org.springframework.boot:spring-boot-starter:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-aop (org.springframework.boot:spring-boot-starter-aop:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-cache (org.springframework.boot:spring-boot-starter-cache:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-data-rest (org.springframework.boot:spring-boot-starter-data-rest:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-log4j2 (org.springframework.boot:spring-boot-starter-log4j2:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-thymeleaf (org.springframework.boot:spring-boot-starter-thymeleaf:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-test (org.springframework.boot:spring-boot-test:3.5.3 - https://spring.io/projects/spring-boot)
+        * spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:3.5.3 - https://spring.io/projects/spring-boot)
+        * Spring Data Core (org.springframework.data:spring-data-commons:3.5.1 - https://spring.io/projects/spring-data)
+        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:4.5.1 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
+        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:4.5.1 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
+        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:2.5.1 - https://github.com/spring-projects/spring-hateoas)
+        * Spring Plugin - Core (org.springframework.plugin:spring-plugin-core:3.0.0 - https://github.com/spring-projects/spring-plugin/spring-plugin-core)
+        * spring-security-config (org.springframework.security:spring-security-config:6.5.1 - https://spring.io/projects/spring-security)
+        * spring-security-core (org.springframework.security:spring-security-core:6.5.1 - https://spring.io/projects/spring-security)
+        * spring-security-crypto (org.springframework.security:spring-security-crypto:6.5.1 - https://spring.io/projects/spring-security)
+        * spring-security-test (org.springframework.security:spring-security-test:6.5.1 - https://spring.io/projects/spring-security)
+        * spring-security-web (org.springframework.security:spring-security-web:6.5.1 - https://spring.io/projects/spring-security)
+        * thymeleaf (org.thymeleaf:thymeleaf:3.1.3.RELEASE - http://www.thymeleaf.org/thymeleaf-lib/thymeleaf)
+        * thymeleaf-spring6 (org.thymeleaf:thymeleaf-spring6:3.1.3.RELEASE - http://www.thymeleaf.org/thymeleaf-lib/thymeleaf-spring6)
+        * unbescape (org.unbescape:unbescape:1.1.6.RELEASE - http://www.unbescape.org)
         * snappy-java (org.xerial.snappy:snappy-java:1.1.10.1 - https://github.com/xerial/snappy-java)
         * xml-matchers (org.xmlmatchers:xml-matchers:0.10 - http://code.google.com/p/xml-matchers/)
         * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.10.2 - https://www.xmlunit.org/)
-        * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.9.1 - https://www.xmlunit.org/)
         * org.xmlunit:xmlunit-placeholders (org.xmlunit:xmlunit-placeholders:2.9.1 - https://www.xmlunit.org/xmlunit-placeholders/)
-        * SnakeYAML (org.yaml:snakeyaml:1.30 - https://bitbucket.org/snakeyaml/snakeyaml)
+        * SnakeYAML (org.yaml:snakeyaml:2.4 - https://bitbucket.org/snakeyaml/snakeyaml)
         * Xerces2-j (xerces:xercesImpl:2.12.2 - https://xerces.apache.org/xerces2-j/)
-        * XML Commons External Components XML APIs (xml-apis:xml-apis:1.4.01 - http://xml.apache.org/commons/components/external/)
 
     BSD License:
 
-        * AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
         * Adobe XMPCore (com.adobe.xmp:xmpcore:6.1.11 - https://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
         * coverity-escapers (com.coverity.security:coverity-escapers:1.1.1 - http://coverity.com/security)
         * Java Advanced Imaging Image I/O Tools API core (standalone) (com.github.jai-imageio:jai-imageio-core:1.4.0 - https://github.com/jai-imageio/jai-imageio-core)
-        * JSONLD Java :: Core (com.github.jsonld-java:jsonld-java:0.5.1 - http://github.com/jsonld-java/jsonld-java/jsonld-java/)
+        * JSONLD Java :: Core (com.github.jsonld-java:jsonld-java:0.13.4 - http://github.com/jsonld-java/jsonld-java/jsonld-java/)
         * curvesapi (com.github.virtuald:curvesapi:1.08 - https://github.com/virtuald/curvesapi)
         * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.15.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
+        * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.24.3 - https://developers.google.com/protocol-buffers/protobuf-java/)
         * JZlib (com.jcraft:jzlib:1.1.3 - http://www.jcraft.com/jzlib/)
         * jmustache (com.samskivert:jmustache:1.15 - http://github.com/samskivert/jmustache)
         * dnsjava (dnsjava:dnsjava:3.6.3 - https://github.com/dnsjava/dnsjava)
         * jaxen (jaxen:jaxen:2.0.0 - http://www.cafeconleche.org/jaxen/jaxen)
-        * ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.5.1-1 - http://www.antlr.org/antlr4-runtime)
+        * ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.13.2 - https://www.antlr.org/antlr4-runtime/)
         * commons-compiler (org.codehaus.janino:commons-compiler:3.1.8 - http://janino-compiler.github.io/commons-compiler/)
         * janino (org.codehaus.janino:janino:3.1.8 - http://janino-compiler.github.io/janino/)
         * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 - http://github.com/FasterXML/stax2-api)
         * Hamcrest Date (org.exparity:hamcrest-date:2.0.8 - https://github.com/exparity/hamcrest-date)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
         * Hamcrest (org.hamcrest:hamcrest:2.2 - http://hamcrest.org/JavaHamcrest/)
         * Hamcrest Core (org.hamcrest:hamcrest-core:2.2 - http://hamcrest.org/JavaHamcrest/)
-        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
+        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.2.2 - http://hdrhistogram.github.io/HdrHistogram/)
         * JBibTeX (org.jbibtex:jbibtex:1.0.20 - http://www.jbibtex.org)
         * asm (org.ow2.asm:asm:8.0.1 - http://asm.ow2.io/)
-        * ASM Analysis (org.ow2.asm:asm-analysis:5.0.3 - http://asm.objectweb.org/asm-analysis/)
-        * asm-commons (org.ow2.asm:asm-commons:9.3 - http://asm.ow2.io/)
-        * ASM Tree (org.ow2.asm:asm-tree:5.0.3 - http://asm.objectweb.org/asm-tree/)
-        * ASM Util (org.ow2.asm:asm-util:5.0.3 - http://asm.objectweb.org/asm-util/)
+        * asm-analysis (org.ow2.asm:asm-analysis:8.0.1 - http://asm.ow2.io/)
+        * asm-commons (org.ow2.asm:asm-commons:8.0.1 - http://asm.ow2.io/)
+        * asm-tree (org.ow2.asm:asm-tree:8.0.1 - http://asm.ow2.io/)
         * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.7.7 - https://jdbc.postgresql.org)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
         * JMatIO (org.tallison:jmatio:1.5 - https://github.com/tballison/jmatio)
@@ -501,29 +503,28 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Common Development and Distribution License (CDDL):
 
-        * JavaMail API (com.sun.mail:javax.mail:1.6.2 - http://javaee.github.io/javamail/javax.mail)
         * JavaMail API (no providers) (com.sun.mail:mailapi:1.6.2 - http://javaee.github.io/javamail/mailapi)
         * Old JAXB Core (com.sun.xml.bind:jaxb-core:2.3.0.1 - http://jaxb.java.net/jaxb-bundles/jaxb-core)
         * Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:2.3.1 - http://jaxb.java.net/jaxb-bundles/jaxb-impl)
-        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
-        * javax.transaction API (jakarta.transaction:jakarta.transaction-api:1.3.3 - https://projects.eclipse.org/projects/ee4j.jta)
-        * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
-        * JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
+        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.1.0 - https://projects.eclipse.org/projects/ee4j.servlet)
+        * jakarta.transaction API (jakarta.transaction:jakarta.transaction-api:2.0.1 - https://projects.eclipse.org/projects/ee4j.jta)
         * JavaBeans Activation Framework API jar (javax.activation:javax.activation-api:1.2.0 - http://java.net/all/javax.activation-api/)
-        * javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 - http://jcp.org/en/jsr/detail?id=250)
+        * javax.annotation API (javax.annotation:javax.annotation-api:1.3 - http://jcp.org/en/jsr/detail?id=250)
         * Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
         * javax.transaction API (javax.transaction:javax.transaction-api:1.3 - http://jta-spec.java.net)
         * jaxb-api (javax.xml.bind:jaxb-api:2.3.1 - https://github.com/javaee/jaxb-spec/jaxb-api)
         * JHighlight (org.codelibs:jhighlight:1.1.0 - https://github.com/codelibs/jhighlight)
-        * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
-        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
-        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
+        * HK2 API module (org.glassfish.hk2:hk2-api:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
+        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
+        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
         * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator)
-        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
-        * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Transaction API (org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final - http://www.jboss.org/jboss-transaction-api_1.2_spec)
+        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
 
     Cordra (Version 2) License Agreement:
 
@@ -536,16 +537,20 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Eclipse Distribution License, Version 1.0:
 
-        * Jakarta Activation (com.sun.activation:jakarta.activation:1.2.2 - https://github.com/eclipse-ee4j/jaf/jakarta.activation)
-        * istack common utility code runtime (com.sun.istack:istack-commons-runtime:3.0.12 - https://projects.eclipse.org/projects/ee4j/istack-commons/istack-commons-runtime)
-        * Jakarta Activation API jar (jakarta.activation:jakarta.activation-api:1.2.2 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
-        * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
-        * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
-        * JAXB Runtime (org.glassfish.jaxb:jaxb-runtime:2.3.9 - https://eclipse-ee4j.github.io/jaxb-ri/)
-        * TXW2 Runtime (org.glassfish.jaxb:txw2:2.3.9 - https://eclipse-ee4j.github.io/jaxb-ri/)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
+        * istack common utility code runtime (com.sun.istack:istack-commons-runtime:4.1.2 - https://projects.eclipse.org/projects/ee4j/istack-commons/istack-commons-runtime)
+        * Jakarta Activation API (jakarta.activation:jakarta.activation-api:2.1.3 - https://github.com/jakartaee/jaf-api)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Persistence API (jakarta.persistence:jakarta.persistence-api:3.1.0 - https://github.com/eclipse-ee4j/jpa-api)
+        * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 - https://github.com/jakartaee/jaxb-api/jakarta.xml.bind-api)
+        * Angus Activation Registries (org.eclipse.angus:angus-activation:2.0.2 - https://github.com/eclipse-ee4j/angus-activation/angus-activation)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
+        * JAXB Core (org.glassfish.jaxb:jaxb-core:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * JAXB Runtime (org.glassfish.jaxb:jaxb-runtime:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * TXW2 Runtime (org.glassfish.jaxb:txw2:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
+        * MIME streaming extension (org.jvnet.mimepull:mimepull:1.9.15 - https://github.com/eclipse-ee4j/metro-mimepull)
         * org.locationtech.jts:jts-core (org.locationtech.jts:jts-core:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-core)
         * org.locationtech.jts.io:jts-io-common (org.locationtech.jts.io:jts-io-common:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-io/jts-io-common)
 
@@ -553,24 +558,27 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
         * System Rules (com.github.stefanbirkner:system-rules:1.19.0 - http://stefanbirkner.github.io/system-rules/)
         * H2 Database Engine (com.h2database:h2:2.3.232 - https://h2database.com)
-        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
-        * javax.transaction API (jakarta.transaction:jakarta.transaction-api:1.3.3 - https://projects.eclipse.org/projects/ee4j.jta)
-        * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
-        * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
+        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Persistence API (jakarta.persistence:jakarta.persistence-api:3.1.0 - https://github.com/eclipse-ee4j/jpa-api)
+        * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.1.0 - https://projects.eclipse.org/projects/ee4j.servlet)
+        * jakarta.transaction API (jakarta.transaction:jakarta.transaction-api:2.0.1 - https://projects.eclipse.org/projects/ee4j.jta)
+        * Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 - https://github.com/eclipse-ee4j/jaxrs-api)
         * JUnit (junit:junit:4.13.2 - http://junit.org)
-        * AspectJ Weaver (org.aspectj:aspectjweaver:1.9.7 - https://www.eclipse.org/aspectj/)
-        * Eclipse Compiler for Java(TM) (org.eclipse.jdt:ecj:3.14.0 - http://www.eclipse.org/jdt)
+        * AspectJ Weaver (org.aspectj:aspectjweaver:1.9.24 - https://www.eclipse.org/aspectj/)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
         * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
         * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.57.v20241219 - https://jetty.org/jetty-alpn-parent/jetty-alpn-java-server/)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.57.v20241219 - https://jetty.org/jetty-alpn-parent/jetty-alpn-server/)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.57.v20241219 - https://jetty.org/jetty-continuation/)
         * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.57.v20241219 - https://jetty.org/jetty-deploy/)
         * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.57.v20241219 - https://jetty.org/jetty-http/)
         * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.57.v20241219 - https://jetty.org/jetty-io/)
@@ -582,35 +590,36 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.57.v20241219 - https://jetty.org/jetty-security/)
         * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.57.v20241219 - https://jetty.org/jetty-server/)
         * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.57.v20241219 - https://jetty.org/jetty-servlet/)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.57.v20241219 - https://jetty.org/jetty-servlets/)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlets)
         * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.57.v20241219 - https://jetty.org/jetty-util/)
         * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.57.v20241219 - https://jetty.org/jetty-util-ajax/)
         * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.57.v20241219 - https://jetty.org/jetty-webapp/)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-xml)
         * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.57.v20241219 - https://jetty.org/jetty-xml/)
+        * Jetty :: ALPN :: API (org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 - http://www.eclipse.org/jetty/alpn-api)
         * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-client)
         * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.57.v20241219 - https://jetty.org/http2-parent/http2-common/)
         * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-hpack)
         * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.57.v20241219 - https://jetty.org/http2-parent/http2-server/)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.15.v20190215 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
-        * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
-        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
-        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
+        * JSON-P Default Provider (org.glassfish:jakarta.json:2.0.1 - https://github.com/eclipse-ee4j/jsonp)
+        * HK2 API module (org.glassfish.hk2:hk2-api:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
+        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
+        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
         * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator)
-        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
-        * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
+        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
         * JUnit Platform Commons (org.junit.platform:junit-platform-commons:1.11.4 - https://junit.org/junit5/)
         * JUnit Platform Engine API (org.junit.platform:junit-platform-engine:1.11.4 - https://junit.org/junit5/)
         * JUnit Vintage Engine (org.junit.vintage:junit-vintage-engine:5.11.4 - https://junit.org/junit5/)
         * org.locationtech.jts:jts-core (org.locationtech.jts:jts-core:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-core)
         * org.locationtech.jts.io:jts-io-common (org.locationtech.jts.io:jts-io-common:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-io/jts-io-common)
-        * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
-        * Jetty Servlet Tester (org.mortbay.jetty:jetty-servlet-tester:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-servlet-tester)
-        * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
 
     GENERAL PUBLIC LICENSE, version 3 (GPL-3.0):
 
@@ -632,10 +641,10 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * uri-template (com.github.java-json-tools:uri-template:0.10 - https://github.com/java-json-tools/uri-template)
         * FindBugs-Annotations (com.google.code.findbugs:annotations:3.0.1u2 - http://findbugs.sourceforge.net/)
         * JHighlight (org.codelibs:jhighlight:1.1.0 - https://github.com/codelibs/jhighlight)
-        * Hibernate ORM - hibernate-core (org.hibernate:hibernate-core:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate ORM - hibernate-jcache (org.hibernate:hibernate-jcache:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate:hibernate-jpamodelgen:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:5.1.2.Final - http://hibernate.org)
+        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:6.0.6.Final - http://hibernate.org)
+        * Hibernate ORM - hibernate-core (org.hibernate.orm:hibernate-core:6.4.8.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jcache (org.hibernate.orm:hibernate-jcache:6.4.8.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate.orm:hibernate-jpamodelgen:6.4.8.Final - https://hibernate.org/orm)
         * im4java (org.im4java:im4java:1.4.0 - http://sourceforge.net/projects/im4java/)
         * Javassist (org.javassist:javassist:3.30.2-GA - https://www.javassist.org/)
         * XOM (xom:xom:1.3.9 - https://xom.nu)
@@ -654,27 +663,26 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     MIT License:
 
+        * dexx (com.github.andrewoma.dexx:collection:0.7 - https://github.com/andrewoma/dexx)
         * better-files (com.github.pathikrit:better-files_2.13:3.9.1 - https://github.com/pathikrit/better-files)
         * Java SemVer (com.github.zafarkhaja:java-semver:0.9.0 - https://github.com/zafarkhaja/jsemver)
         * dd-plist (com.googlecode.plist:dd-plist:1.28 - http://www.github.com/3breadt/dd-plist)
         * DigitalCollections: IIIF API Library (de.digitalcollections.iiif:iiif-apis:0.3.11 - https://github.com/dbmdz/iiif-apis)
         * s3mock (io.findify:s3mock_2.13:0.2.6 - https://github.com/findify/s3mock)
-        * ClassGraph (io.github.classgraph:classgraph:4.8.154 - https://github.com/classgraph/classgraph)
+        * ClassGraph (io.github.classgraph:classgraph:4.8.165 - https://github.com/classgraph/classgraph)
         * JOpt Simple (net.sf.jopt-simple:jopt-simple:5.0.4 - http://jopt-simple.github.io/jopt-simple)
         * Bouncy Castle JavaMail S/MIME APIs (org.bouncycastle:bcmail-jdk18on:1.80 - https://www.bouncycastle.org/download/bouncy-castle-java/)
         * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/)
         * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/)
         * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/)
         * org.brotli:dec (org.brotli:dec:0.1.2 - http://brotli.org/dec)
-        * Checker Qual (org.checkerframework:checker-qual:3.23.0 - https://checkerframework.org)
-        * Checker Qual (org.checkerframework:checker-qual:3.49.3 - https://checkerframework.org/)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Checker Qual (org.checkerframework:checker-qual:3.49.5 - https://checkerframework.org/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
         * mockito-core (org.mockito:mockito-core:3.12.4 - https://github.com/mockito/mockito)
         * mockito-inline (org.mockito:mockito-inline:3.12.4 - https://github.com/mockito/mockito)
-        * ORCID - Model (org.orcid:orcid-model:3.0.2 - http://github.com/ORCID/orcid-model)
-        * JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 - http://www.slf4j.org)
-        * SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
+        * SLF4J API Module (org.slf4j:slf4j-api:2.0.17 - http://www.slf4j.org)
         * HAL Browser (org.webjars:hal-browser:ad9b865 - http://webjars.org)
         * toastr (org.webjars.bowergithub.codeseven:toastr:2.1.4 - http://webjars.org)
         * backbone (org.webjars.bowergithub.jashkenas:backbone:1.4.1 - https://www.webjars.org)
@@ -695,10 +703,11 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Public Domain:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
+        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.2.2 - http://hdrhistogram.github.io/HdrHistogram/)
         * JSON in Java (org.json:json:20231013 - https://github.com/douglascrockford/JSON-java)
         * LatencyUtils (org.latencyutils:LatencyUtils:2.0.3 - http://latencyutils.github.io/LatencyUtils/)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
@@ -713,10 +722,12 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     W3C license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
 
     jQuery license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.47 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.10 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)

README.md

@@ -20,7 +20,7 @@ DSpace consists of both a Java-based backend and an Angular-based frontend.
     * The REST Contract is at https://github.com/DSpace/RestContract
 * Frontend (https://github.com/DSpace/dspace-angular/) is the User Interface built on the REST API
 
-Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPUI). Those UIs are no longer supported in v7 (and above).
+Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPUI). Those UIs are no longer supported in v7 and above.
 * A maintenance branch for older versions is still available, see `dspace-6_x` for 6.x maintenance.
 
 ## Downloads
@@ -33,18 +33,18 @@ Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPU
 Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
 
 The latest DSpace Installation instructions are available at:
-https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
+https://wiki.lyrasis.org/display/DSDOC8x/Installing+DSpace
 
 Please be aware that, as a Java web application, DSpace requires a database (PostgreSQL)
 and a servlet container (usually Tomcat) in order to function.
 More information about these and all other prerequisites can be found in the Installation instructions above.
 
-## Running DSpace 7 in Docker
+## Running DSpace 8 in Docker
 
 NOTE: At this time, we do not have production-ready Docker images for DSpace.
 That said, we do have quick-start Docker Compose scripts for development or testing purposes.
 
-See [Running DSpace 7 with Docker Compose](dspace/src/main/docker-compose/README.md)
+See [Running DSpace 8 with Docker Compose](dspace/src/main/docker-compose/README.md)
 
 ## Contributing
 
@@ -64,7 +64,7 @@ Great Q&A is also available under the [DSpace tag on Stackoverflow](http://stack
 Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Support
 
 DSpace also has an active service provider network. If you'd rather hire a service provider to
-install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
+install, upgrade, customize, or host DSpace, then we recommend getting in touch with one of our
 [Registered Service Providers](http://www.dspace.org/service-providers).
 
 ## Issue Tracker
@@ -112,7 +112,7 @@ run automatically by [GitHub Actions](https://github.com/DSpace/DSpace/actions?q
   ```
 * How to run only tests of a specific DSpace module
   ```
-  # Before you can run only one module's tests, other modules may need installing into your ~/.m2
+  # Before you can run only one module's tests, other modules may need to be installed into your ~/.m2
   cd [dspace-src]
   mvn clean install
 

docker-compose-cli.yml

@@ -6,7 +6,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
     container_name: dspace-cli
     build:
       context: .

docker-compose.yml

@@ -28,7 +28,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
     build:
       context: .
       dockerfile: Dockerfile.test
@@ -39,8 +39,6 @@ services:
     ports:
     - published: 8080
       target: 8080
-    - published: 8009
-      target: 8009
     - published: 8000
       target: 8000
     stdin_open: true
@@ -54,19 +52,19 @@ services:
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
-    # 3. Finally, start Tomcat
+    # 3. Finally, start DSpace
     entrypoint:
     - /bin/bash
     - '-c'
     - |
       while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate
-      catalina.sh run
+      java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
   # DSpace PostgreSQL database container
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
     build:
       # Must build out of subdirectory to have access to install script for pgcrypto
       context: ./dspace/src/main/docker/dspace-postgres-pgcrypto/
@@ -86,7 +84,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
     build:
       context: ./dspace/src/main/docker/dspace-solr/
       # Provide path to Solr configs necessary to build Docker image
@@ -122,6 +120,10 @@ services:
       cp -r /opt/solr/server/solr/configsets/search/* search
       precreate-core statistics /opt/solr/server/solr/configsets/statistics
       cp -r /opt/solr/server/solr/configsets/statistics/* statistics
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
+      precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
+      cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
       exec solr -f
 volumes:
   assetstore:

dspace-api/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.5</version>
+        <version>8.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -54,21 +54,21 @@
                         <!-- Enable Hibernate's Metamodel Generator to generate metadata model classes
                              (ending in _ suffix) for more type-safe Criteria queries -->
                         <path>
-                            <groupId>org.hibernate</groupId>
+                            <groupId>org.hibernate.orm</groupId>
                             <artifactId>hibernate-jpamodelgen</artifactId>
                             <version>${hibernate.version}</version>
                         </path>
                         <!-- Enable JAXB -->
                         <path>
-                            <groupId>javax.xml.bind</groupId>
-                            <artifactId>jaxb-api</artifactId>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
                             <version>${jaxb-api.version}</version>
                         </path>
                         <!-- Enable Commons Annotations -->
                         <path>
-                            <groupId>javax.annotation</groupId>
-                            <artifactId>javax.annotation-api</artifactId>
-                            <version>${javax-annotation.version}</version>
+                            <groupId>jakarta.annotation</groupId>
+                            <artifactId>jakarta.annotation-api</artifactId>
+                            <version>${jakarta-annotation.version}</version>
                         </path>
                         <!-- Enable http://errorprone.info -->
                         <path>
@@ -99,20 +99,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.1</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>maven-version</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
@@ -177,7 +163,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.5.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>workflow-curation</id>
@@ -265,7 +251,7 @@
                                 <!-- Specify the dspace.dir to use for test environment -->
                                 <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
                                 <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
                                 <!-- Turn off any DSpace logging -->
                                 <dspace.log.init.disable>true</dspace.log.init.disable>
                                 <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
@@ -324,7 +310,7 @@
                             <systemPropertyVariables>
                                 <!-- Specify the dspace.dir to use for test environment -->
                                 <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
                                 <!-- Turn off any DSpace logging -->
                                 <dspace.log.init.disable>true</dspace.log.init.disable>
                                 <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
@@ -342,18 +328,23 @@
             <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-                <exclusions>
-                    <!-- Newer version pulled in via Jersey below -->
-                    <exclusion>
-                        <groupId>org.javassist</groupId>
-                        <artifactId>javassist</artifactId>
-                    </exclusion>
-                </exclusions>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-jcache</artifactId>
         </dependency>
         <dependency>
@@ -375,23 +366,18 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-jpamodelgen</artifactId>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.2.Final</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -409,23 +395,17 @@
             <groupId>net.handle</groupId>
             <artifactId>handle</artifactId>
         </dependency>
+        <!-- Only necessary to run Handle Server from commandline. This is why it is a runtime dependency. -->
         <dependency>
             <groupId>net.cnri</groupId>
             <artifactId>cnri-servlet-container</artifactId>
+            <scope>runtime</scope>
             <exclusions>
-                <!-- Newer versions provided in our parent POM -->
+                <!-- Excluded because this library is incompatible with Jakarta EE. It causes errors in DSpace during
+                     startup & integration testing. Excluding doesn't seem to effect Handle Server startup. -->
                 <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <!-- Newer version of Bouncycastle brought in via Tika -->
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.mortbay.jasper</groupId>
+                    <artifactId>apache-jsp</artifactId>
                 </exclusion>
                 <!-- Excluded BouncyCastle dependencies because we use a later version of BouncyCastle.
                      Having two versions of BouncyCastle in the classpath can cause Handle Server to throw errors. -->
@@ -439,10 +419,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Jetty is needed to run Handle Server -->
+
+        <!-- Jetty is needed to run Handle Server ONLY. This is why it is a runtime dependency. -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.dspace</groupId>
@@ -452,12 +434,6 @@
             <groupId>org.apache.jena</groupId>
             <artifactId>apache-jena-libs</artifactId>
             <type>pom</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -493,17 +469,22 @@
             <artifactId>commons-validator</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
@@ -599,6 +580,13 @@
             <artifactId>solr-core</artifactId>
             <scope>test</scope>
             <version>${solr.client.version}</version>
+            <exclusions>
+                <!-- Later version provided by Hibernate -->
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -678,29 +666,12 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>8.5.13</version>
-        </dependency>
-
-        <!-- Google Analytics -->
-        <dependency>
-            <groupId>com.google.apis</groupId>
-            <artifactId>google-api-services-analytics</artifactId>
+            <version>${flyway.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.api-client</groupId>
-            <artifactId>google-api-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.http-client</groupId>
-            <artifactId>google-http-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.http-client</groupId>
-            <artifactId>google-http-client-jackson2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.oauth-client</groupId>
-            <artifactId>google-oauth-client</artifactId>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <version>${flyway.version}</version>
         </dependency>
 
         <!-- FindBugs -->
@@ -714,27 +685,21 @@
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <type>jar</type>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
 
         <!-- JAXB API and implementation (no longer bundled as of Java 11) -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
         </dependency>
 
-        <!-- Jersey / JAX-RS client (javax.ws.rs.*) dependencies needed to integrate with external sources/services -->
+        <!-- Jersey / JAX-RS client (jakarta.ws.rs.*) dependencies needed to integrate with external sources/services -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -752,33 +717,25 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.785</version>
+            <version>1.12.792</version>
         </dependency>
 
+        <!-- TODO: This may need to be replaced with the "orcid-model" artifact once this ticket is resolved:
+             https://github.com/ORCID/orcid-model/issues/50 -->
+        <!-- Maintained at https://github.com/DSpace/orcid-model -->
         <dependency>
-            <groupId>org.orcid</groupId>
-            <artifactId>orcid-model</artifactId>
-            <version>3.0.2</version>
+            <groupId>org.dspace</groupId>
+            <artifactId>orcid-model-jakarta</artifactId>
+            <version>3.3.0</version>
             <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                    <artifactId>jackson-jaxrs-json-provider</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.javassist</groupId>
                     <artifactId>javassist</artifactId>
                 </exclusion>
+                <!-- Exclude snakeyaml as a newer version is brought in by Spring Boot -->
                 <exclusion>
-                	<groupId>io.swagger</groupId>
-                	<artifactId>swagger-jersey-jaxrs</artifactId>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -801,18 +758,20 @@
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.11.1</version>
+            <version>5.12.0</version>
         </dependency>
 
         <!-- Email templating -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
+            <version>2.4.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
+            <version>2.10.4</version>
             <scope>test</scope>
         </dependency>
 
@@ -837,6 +796,12 @@
             </exclusions>
         </dependency>
         
+        <dependency>
+          <groupId>eu.openaire</groupId>
+          <artifactId>broker-client</artifactId>
+          <version>1.1.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-junit-rule</artifactId>
@@ -848,6 +813,20 @@
             		<groupId>org.yaml</groupId>
             		<artifactId>snakeyaml</artifactId>
             	</exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.datatype</groupId>
+                    <artifactId>jackson-datatype-jsr310</artifactId>
+                </exclusion>
+                <!-- Resolve dependency conflicts with Hibernate -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <!-- Resolve dependency conflicts with Solr -->
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         
@@ -873,77 +852,5 @@
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
-    
     </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-          <!-- for mockserver -->
-          <!-- Solve dependency convergence issues related to Solr and
-               'mockserver-junit-rule' by selecting the versions we want to use. -->
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-            <version>4.2.2.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <version>4.2.2.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-unix-common</artifactId>
-            <version>4.2.2.Final</version>
-           </dependency>
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <version>4.2.2.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.2.2.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
-            <version>4.2.2.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.4.1</version>
-          </dependency>
-          <dependency>
-              <groupId>org.xmlunit</groupId>
-              <artifactId>xmlunit-core</artifactId>
-              <version>2.10.2</version>
-              <scope>test</scope>
-          </dependency>
-          <dependency>
-            <groupId>com.github.java-json-tools</groupId>
-            <artifactId>json-schema-validator</artifactId>
-            <version>2.2.14</version>
-          </dependency>
-          <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
-          </dependency>
-          <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>2.13.16</version>
-            <scope>test</scope>
-          </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 </project>

dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java

@@ -8,6 +8,8 @@
 package org.dspace.access.status;
 
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 
 import org.dspace.access.status.service.AccessStatusService;
@@ -15,7 +17,6 @@ import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.service.PluginService;
 import org.dspace.services.ConfigurationService;
-import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -55,7 +56,10 @@ public class AccessStatusServiceImpl implements AccessStatusService {
             int month = configurationService.getIntProperty("access.status.embargo.forever.month");
             int day = configurationService.getIntProperty("access.status.embargo.forever.day");
 
-            forever_date = new LocalDate(year, month, day).toDate();
+            forever_date = Date.from(LocalDate.of(year, month, day)
+                    .atStartOfDay()
+                    .atZone(ZoneId.systemDefault())
+                    .toInstant());
         }
     }
 

dspace-api/src/main/java/org/dspace/access/status/DefaultAccessStatusHelper.java

@@ -8,6 +8,7 @@
 package org.dspace.access.status;
 
 import java.sql.SQLException;
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -26,7 +27,6 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.eperson.Group;
-import org.joda.time.LocalDate;
 
 /**
  * Default plugin implementation of the access status helper.
@@ -230,7 +230,7 @@ public class DefaultAccessStatusHelper implements AccessStatusHelper {
                     // If the policy is not valid there is an active embargo
                     Date startDate = policy.getStartDate();
 
-                    if (startDate != null && !startDate.before(LocalDate.now().toDate())) {
+                    if (startDate != null && !startDate.before(Date.from(Instant.now()))) {
                         // There is an active embargo: aim to take the shortest embargo (account for rare cases where
                         // more than one resource policy exists)
                         if (embargoDate == null) {

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

@@ -21,6 +21,8 @@ import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
@@ -30,8 +32,6 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataSchemaService;
 import org.dspace.core.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -40,9 +40,9 @@ import org.xml.sax.SAXException;
 /**
  * @author Richard Jones
  *
- * This class takes an xml document as passed in the arguments and
+ * This class takes an XML document as passed in the arguments and
  * uses it to create metadata elements in the Metadata Registry if
- * they do not already exist
+ * they do not already exist.
  *
  * The format of the XML file is as follows:
  *
@@ -69,7 +69,7 @@ public class MetadataImporter {
     /**
      * logging category
      */
-    private static final Logger log = LoggerFactory.getLogger(MetadataImporter.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Default constructor
@@ -89,6 +89,7 @@ public class MetadataImporter {
      * @throws SAXException                 if parser error
      * @throws NonUniqueMetadataException   if duplicate metadata
      * @throws RegistryImportException      if import fails
+     * @throws XPathExpressionException     passed through
      **/
     public static void main(String[] args)
         throws ParseException, SQLException, IOException, TransformerException,
@@ -125,6 +126,7 @@ public class MetadataImporter {
      * @throws SAXException                 if parser error
      * @throws NonUniqueMetadataException   if duplicate metadata
      * @throws RegistryImportException      if import fails
+     * @throws XPathExpressionException     passed through
      */
     public static void loadRegistry(String file, boolean forceUpdate)
         throws SQLException, IOException, TransformerException, ParserConfigurationException, AuthorizeException,
@@ -203,7 +205,7 @@ public class MetadataImporter {
 
         if (s == null) {
             // Schema does not exist - create
-            log.info("Registering Schema " + name + " (" + namespace + ")");
+            log.info("Registering Schema {}({})", name, namespace);
             metadataSchemaService.create(context, name, namespace);
         } else {
             // Schema exists - if it's the same namespace, allow the type imports to continue
@@ -215,7 +217,7 @@ public class MetadataImporter {
             // It's a different namespace - have we been told to update?
             if (updateExisting) {
                 // Update the existing schema namespace and continue to type import
-                log.info("Updating Schema " + name + ": New namespace " + namespace);
+                log.info("Updating Schema {}: New namespace {}", name, namespace);
                 s.setNamespace(namespace);
                 metadataSchemaService.update(context, s);
             } else {
@@ -274,7 +276,7 @@ public class MetadataImporter {
         if (qualifier == null) {
             fieldName = schema + "." + element;
         }
-        log.info("Registering metadata field " + fieldName);
+        log.info("Registering metadata field {}", fieldName);
         MetadataField field = metadataFieldService.create(context, schemaObj, element, qualifier, scopeNote);
         metadataFieldService.update(context, field);
     }

dspace-api/src/main/java/org/dspace/alerts/SystemWideAlert.java

@@ -8,17 +8,17 @@
 package org.dspace.alerts;
 
 import java.util.Date;
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.core.ReloadableEntity;

dspace-api/src/main/java/org/dspace/alerts/dao/impl/SystemWideAlertDAOImpl.java

@@ -9,10 +9,10 @@ package org.dspace.alerts.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.alerts.SystemWideAlert;
 import org.dspace.alerts.SystemWideAlert_;
 import org.dspace.alerts.dao.SystemWideAlertDAO;

dspace-api/src/main/java/org/dspace/app/bulkaccesscontrol/BulkAccessControl.java

@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
@@ -154,7 +155,7 @@ public class BulkAccessControl extends DSpaceRunnable<BulkAccessControlScriptCon
         }
 
         ObjectMapper mapper = new ObjectMapper();
-        mapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+        mapper.setTimeZone(TimeZone.getTimeZone(ZoneOffset.UTC));
         BulkAccessControlInput accessControl;
         context = new Context(Context.Mode.BATCH_EDIT);
         setEPerson(context);

dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java

@@ -14,6 +14,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.DefaultParser.Builder;
 import org.apache.commons.cli.ParseException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataDSpaceCsvExportServiceImpl;
@@ -167,4 +169,14 @@ public class MetadataExportSearch extends DSpaceRunnable<MetadataExportSearchScr
         }
         return scopeObj;
     }
+
+    @Override
+    protected StepResult parse(String[] args) throws ParseException {
+        commandLine = new DefaultParser().parse(getScriptConfiguration().getOptions(), args);
+        Builder builder = new DefaultParser().builder();
+        builder.setStripLeadingAndTrailingQuotes(false);
+        commandLine = builder.build().parse(getScriptConfiguration().getOptions(), args);
+        setup();
+        return StepResult.Continue;
+    }
 }

dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java

@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -494,7 +494,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
 
                 // Check it has an owning collection
                 List<String> collections = line.get("collection");
-                if (collections == null) {
+                if (collections == null || collections.isEmpty()) {
                     throw new MetadataImportException(
                         "New items must have a 'collection' assigned in the form of a handle");
                 }

dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java

@@ -31,8 +31,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.itemexport.service.ItemExportService;
@@ -363,12 +363,14 @@ public class ItemExportServiceImpl implements ItemExportService {
         File outFile = new File(destDir, "collections");
         if (outFile.createNewFile()) {
             try (PrintWriter out = new PrintWriter(new FileWriter(outFile))) {
-                String ownerHandle = item.getOwningCollection().getHandle();
-                out.println(ownerHandle);
+                Collection owningCollection = item.getOwningCollection();
+                // The owning collection is null for workspace and workflow items
+                if (owningCollection != null) {
+                    out.println(owningCollection.getHandle());
+                }
                 for (Collection collection : item.getCollections()) {
-                    String collectionHandle = collection.getHandle();
-                    if (!collectionHandle.equals(ownerHandle)) {
-                        out.println(collectionHandle);
+                    if (!collection.equals(owningCollection)) {
+                        out.println(collection.getHandle());
                     }
                 }
             }

dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java

@@ -11,8 +11,8 @@ import java.io.InputStream;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.Context;

dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java

@@ -22,6 +22,7 @@ import java.util.UUID;
 
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tika.Tika;
 import org.dspace.app.itemimport.factory.ItemImportServiceFactory;
@@ -333,6 +334,7 @@ public class ItemImport extends DSpaceRunnable<ItemImportScriptConfiguration> {
     protected void readZip(Context context, ItemImportService itemImportService) throws Exception {
         Optional<InputStream> optionalFileStream = Optional.empty();
         Optional<InputStream> validationFileStream = Optional.empty();
+        try {
             if (!remoteUrl) {
                 // manage zip via upload
                 optionalFileStream = handler.getFileStream(context, zipfilename);
@@ -360,6 +362,10 @@ public class ItemImport extends DSpaceRunnable<ItemImportScriptConfiguration> {
             workDir = new File(itemImportService.getTempWorkDir() + File.separator + TEMP_DIR
                     + File.separator + context.getCurrentUser().getID());
             sourcedir = itemImportService.unzip(workFile, workDir.getAbsolutePath());
+        } finally {
+            optionalFileStream.ifPresent(IOUtils::closeQuietly);
+            validationFileStream.ifPresent(IOUtils::closeQuietly);
+        }
     }
 
     /**

dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLI.java

@@ -17,6 +17,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.itemimport.service.ItemImportService;
 import org.dspace.content.Collection;
@@ -111,7 +112,11 @@ public class ItemImportCLI extends ItemImport {
 
                 // validate zip file
                 InputStream validationFileStream = new FileInputStream(myZipFile);
+                try {
                     validateZip(validationFileStream);
+                } finally {
+                    IOUtils.closeQuietly(validationFileStream);
+                }
 
                 workDir = new File(itemImportService.getTempWorkDir() + File.separator + TEMP_DIR
                         + File.separator + context.getCurrentUser().getID());
@@ -120,9 +125,11 @@ public class ItemImportCLI extends ItemImport {
             } else {
                 // manage zip via remote url
                 Optional<InputStream> optionalFileStream = Optional.ofNullable(new URL(zipfilename).openStream());
+                Optional<InputStream> validationFileStream = Optional.ofNullable(new URL(zipfilename).openStream());
+                try {
                     if (optionalFileStream.isPresent()) {
                         // validate zip file via url
-                    Optional<InputStream> validationFileStream = Optional.ofNullable(new URL(zipfilename).openStream());
+
                         if (validationFileStream.isPresent()) {
                             validateZip(validationFileStream.get());
                         }
@@ -137,6 +144,10 @@ public class ItemImportCLI extends ItemImport {
                         throw new IllegalArgumentException(
                                 "Error reading file, the file couldn't be found for filename: " + zipfilename);
                     }
+                } finally {
+                    optionalFileStream.ifPresent(IOUtils::closeQuietly);
+                    validationFileStream.ifPresent(IOUtils::closeQuietly);
+                }
             }
         }
     }

dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java

@@ -47,7 +47,6 @@ import java.util.TreeMap;
 import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import javax.mail.MessagingException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -56,6 +55,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.collections4.ComparatorUtils;
 import org.apache.commons.io.FileDeleteStrategy;
 import org.apache.commons.io.FileUtils;

dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java

@@ -10,8 +10,8 @@ package org.dspace.app.itemimport.service;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.dspace.app.itemimport.BatchUpload;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;

dspace-api/src/main/java/org/dspace/app/ldn/ItemFilter.java

@@ -0,0 +1,30 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+/**
+ * model class for the item filters configured into item-filters.xml
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class ItemFilter {
+
+    private String id;
+
+    public ItemFilter(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageConsumer.java

@@ -0,0 +1,329 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import static java.lang.String.format;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.ldn.factory.NotifyServiceFactory;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.content.Bitstream;
+import org.dspace.content.BitstreamFormat;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.logic.LogicalStatement;
+import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.core.I18nUtil;
+import org.dspace.core.LDN;
+import org.dspace.event.Consumer;
+import org.dspace.event.Event;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.dspace.versioning.Version;
+import org.dspace.versioning.VersionHistory;
+import org.dspace.versioning.factory.VersionServiceFactory;
+import org.dspace.versioning.service.VersionHistoryService;
+import org.dspace.web.ContextUtil;
+
+/**
+ * class for creating a new LDN Messages of installed item
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageConsumer implements Consumer {
+
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+    private NotifyServiceInboundPatternService inboundPatternService;
+    private LDNMessageService ldnMessageService;
+    private ConfigurationService configurationService;
+    private ItemService itemService;
+    private BitstreamService bitstreamService;
+    private final String RESUBMISSION_SUFFIX = "-resubmission";
+    private final String ENDORSEMENT_PATTERN = "request-endorsement";
+    private final String REVIEW_PATTERN = "request-review";
+
+    @Override
+    public void initialize() throws Exception {
+        notifyPatternToTriggerService = NotifyServiceFactory.getInstance().getNotifyPatternToTriggerService();
+        ldnMessageService = NotifyServiceFactory.getInstance().getLDNMessageService();
+        configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        itemService = ContentServiceFactory.getInstance().getItemService();
+        bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
+        inboundPatternService = NotifyServiceFactory.getInstance().getNotifyServiceInboundPatternService();
+    }
+
+    @Override
+    public void consume(Context context, Event event) throws Exception {
+
+        if (event.getSubjectType() != Constants.ITEM ||
+            event.getEventType() != Event.INSTALL) {
+            return;
+        }
+
+        Item item = (Item) event.getSubject(context);
+        if (item == null) {
+            return;
+        }
+        createManualLDNMessages(context, item);
+        createAutomaticLDNMessages(context, item);
+    }
+
+    private void createManualLDNMessages(Context context, Item item) throws SQLException, JsonProcessingException {
+        List<NotifyPatternToTrigger> patternsToTrigger =
+            notifyPatternToTriggerService.findByItem(context, item);
+        // Note that multiple patterns can be submitted and not all support resubmission
+        // 1. Extract all patterns that accept resubmissions, i.e. endorsement and review
+        List<Integer> patternsSupportingResubmission = patternsToTrigger.stream()
+                .filter(p -> p.getPattern().equals(REVIEW_PATTERN) || p.getPattern().equals(ENDORSEMENT_PATTERN))
+                .map(NotifyPatternToTrigger::getID).toList();
+
+        String resubmissionReplyToID = null;
+
+        for (NotifyPatternToTrigger patternToTrigger : patternsToTrigger) {
+            // Only try to fetch resubmission ID if the pattern support resubmission
+            if (patternsSupportingResubmission.contains(patternToTrigger.getID())) {
+                resubmissionReplyToID = findResubmissionReplyToUUID(context, item, patternToTrigger.getNotifyService());
+            }
+
+            createLDNMessage(context,patternToTrigger.getItem(),
+                    patternToTrigger.getNotifyService(),
+                    patternToTrigger.getPattern(),
+                    resubmissionReplyToID);
+        }
+    }
+
+    private void createAutomaticLDNMessages(Context context, Item item) throws SQLException, JsonProcessingException {
+
+        List<NotifyServiceInboundPattern> inboundPatterns = inboundPatternService.findAutomaticPatterns(context);
+
+        for (NotifyServiceInboundPattern inboundPattern : inboundPatterns) {
+            if (StringUtils.isEmpty(inboundPattern.getConstraint()) ||
+                evaluateFilter(context, item, inboundPattern.getConstraint())) {
+                createLDNMessage(context, item, inboundPattern.getNotifyService(),
+                        inboundPattern.getPattern(), null);
+            }
+        }
+    }
+
+    private String findResubmissionReplyToUUID(Context context, Item item, NotifyServiceEntity service)
+            throws SQLException {
+        // 1.1 Check whether this is a new version submission
+        VersionHistoryService versionHistoryService = VersionServiceFactory.getInstance()
+                .getVersionHistoryService();
+        VersionHistory versionHistory = versionHistoryService.findByItem(context, item);
+
+        if (versionHistory != null) {
+            Version currentVersion = versionHistoryService.getVersion(context, versionHistory, item);
+            Version previousVersion = versionHistoryService.getPrevious(context, versionHistory, currentVersion);
+            if (previousVersion != null) {
+                // 1.2 and a TentativeReject notification, matching the current pattern's service, was received for the
+                // previous item version
+                return ldnMessageService.findEndorsementOrReviewResubmissionIdByItem(context,
+                        previousVersion.getItem(), service);
+            }
+        }
+        // New submission (new item, or previous version with a tentativeReject notification not found)
+        return null;
+    }
+
+    private boolean evaluateFilter(Context context, Item item, String constraint) {
+        LogicalStatement filter =
+            new DSpace().getServiceManager().getServiceByName(constraint, LogicalStatement.class);
+
+        return filter != null && filter.getResult(context, item);
+    }
+
+    private void createLDNMessage(Context context, Item item, NotifyServiceEntity service, String pattern,
+                                  String resubmissionID)
+            throws SQLException, JsonProcessingException {
+        // Amend current pattern name to trigger
+        // Endorsement or Review offer resubmissions: append '-resubmission' to pattern name to choose the correct
+        // LDN message template: e.g. request-endorsement-resubmission or request-review-resubmission
+        LDN ldn = (resubmissionID != null)
+                ? getLDNMessage(pattern + RESUBMISSION_SUFFIX) : getLDNMessage(pattern);
+        LDNMessageEntity ldnMessage =
+                ldnMessageService.create(context, format("urn:uuid:%s", UUID.randomUUID()));
+
+        ldnMessage.setObject(item);
+        ldnMessage.setTarget(service);
+        ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        ldnMessage.setQueueTimeout(new Date());
+
+        String actorID = null;
+        boolean serviceUsesActorEmailId =
+                configurationService.getBooleanProperty(
+                        String.format("ldn.notification.supportsActorEmailId.%d", service.getID()), false);
+        if (serviceUsesActorEmailId) {
+            // If the service has been configured to use actorEmailId, we use the submitter's email and name
+            if (item.getSubmitter() != null) {
+                actorID = item.getSubmitter().getEmail();
+            } else {
+                // Use configured fallback email (defaults to mail.admin property)
+                actorID = configurationService.getProperty("ldn.notification.email.submitter.fallback");
+            }
+        }
+        appendGeneratedMessage(ldn,
+                ldnMessage,
+                actorID,
+                (actorID != null && item.getSubmitter() != null) ? item.getSubmitter().getFullName() : null,
+                resubmissionID);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+        ldnMessage.setType(StringUtils.joinWith(",", notification.getType()));
+
+        ArrayList<String> notificationTypeArrayList = new ArrayList<String>(notification.getType());
+        // sorting the list
+        Collections.sort(notificationTypeArrayList);
+        ldnMessage.setActivityStreamType(notificationTypeArrayList.get(0));
+        ldnMessage.setCoarNotifyType(notificationTypeArrayList.get(1));
+        // If a resubmission, set inReplyTo
+        if (resubmissionID != null) {
+            ldnMessage.setInReplyTo(ldnMessageService.find(context, resubmissionID));
+        }
+
+        ldnMessageService.update(context, ldnMessage);
+    }
+
+    private LDN getLDNMessage(String pattern) {
+        try {
+            return LDN.getLDNMessage(I18nUtil.getLDNFilename(Locale.getDefault(), pattern));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void appendGeneratedMessage(LDN ldn, LDNMessageEntity ldnMessage, String actorID, String actorName,
+                                        String resubmissionId) {
+        Item item = (Item) ldnMessage.getObject();
+        if (actorID != null) {
+            ldn.addArgument("mailto:" + actorID);
+        } else {
+            ldn.addArgument(getUiUrl());
+        }
+        ldn.addArgument(configurationService.getProperty("ldn.notify.inbox"));
+        ldn.addArgument(actorName != null ? actorName : configurationService.getProperty("dspace.name"));
+        ldn.addArgument(Objects.requireNonNullElse(ldnMessage.getTarget().getUrl(), ""));
+        ldn.addArgument(Objects.requireNonNullElse(ldnMessage.getTarget().getLdnUrl(), ""));
+        ldn.addArgument(getUiUrl() + "/handle/" + ldnMessage.getObject().getHandle());
+        ldn.addArgument(getIdentifierUri(item));
+        ldn.addArgument(generateBitstreamDownloadUrl(item));
+        ldn.addArgument(getBitstreamMimeType(findPrimaryBitstream(item)));
+        ldn.addArgument(ldnMessage.getID());
+        ldn.addArgument(getRelationUri(item));
+        ldn.addArgument("http://purl.org/vocab/frbr/core#supplement");
+        ldn.addArgument(format("urn:uuid:%s", UUID.randomUUID()));
+        if (actorID != null) {
+            ldn.addArgument("Person");
+        } else {
+            ldn.addArgument("Service");
+        }
+        // Param 14: UI URL, LDN message origin
+        ldn.addArgument(getUiUrl());
+        // Param 15: inReplyTo ID, used in endorsement resubmission notifications
+        if (resubmissionId != null) {
+            ldn.addArgument(String.format("\"inReplyTo\": \"%s\",", resubmissionId));
+        }
+
+        ldnMessage.setMessage(ldn.generateLDNMessage());
+    }
+
+    private String getUiUrl() {
+        return configurationService.getProperty("dspace.ui.url");
+    }
+
+    private String getIdentifierUri(Item item) {
+        return itemService.getMetadataByMetadataString(item, "dc.identifier.uri")
+                          .stream()
+                          .findFirst()
+                          .map(MetadataValue::getValue)
+                          .orElse("");
+    }
+
+    private String getRelationUri(Item item) {
+        String relationMetadata = configurationService.getProperty("ldn.notify.relation.metadata", "dc.relation");
+        return itemService.getMetadataByMetadataString(item, relationMetadata)
+                          .stream()
+                          .findFirst()
+                          .map(MetadataValue::getValue)
+                          .orElse("");
+    }
+
+    private String generateBitstreamDownloadUrl(Item item) {
+        String uiUrl = getUiUrl();
+        return findPrimaryBitstream(item)
+            .map(bs -> uiUrl + "/bitstreams/" + bs.getID() + "/download")
+            .orElse("");
+    }
+
+    private Optional<Bitstream> findPrimaryBitstream(Item item) {
+        List<Bundle> bundles = item.getBundles(Constants.CONTENT_BUNDLE_NAME);
+        return bundles.stream()
+                      .findFirst()
+                      .map(Bundle::getPrimaryBitstream)
+                      .or(() -> bundles.stream()
+                                       .findFirst()
+                                       .flatMap(bundle -> CollectionUtils.isNotEmpty(bundle.getBitstreams())
+                                           ? Optional.of(bundle.getBitstreams().get(0))
+                                           : Optional.empty()));
+    }
+
+    private String getBitstreamMimeType(Optional<Bitstream> bitstream) {
+        return bitstream.map(bs -> {
+            try {
+                Context context = ContextUtil.obtainCurrentRequestContext();
+                BitstreamFormat bitstreamFormat = bs.getFormat(context);
+                if (bitstreamFormat.getShortDescription().equals("Unknown")) {
+                    return getUserFormatMimeType(bs);
+                }
+                return bitstreamFormat.getMIMEType();
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }).orElse("");
+    }
+
+    private String getUserFormatMimeType(Bitstream bitstream) {
+        return bitstreamService.getMetadataFirstValue(bitstream,
+            "dc", "format", "mimetype", Item.ANY);
+    }
+
+    @Override
+    public void end(Context ctx) throws Exception {
+
+    }
+
+    @Override
+    public void finish(Context ctx) throws Exception {
+
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageEntity.java

@@ -0,0 +1,325 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import java.lang.reflect.Field;
+import java.util.Date;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import org.dspace.content.DSpaceObject;
+import org.dspace.core.ReloadableEntity;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Class representing ldnMessages stored in the DSpace system and, when locally resolvable,
+ * some information are stored as dedicated attributes.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "ldn_message")
+public class LDNMessageEntity implements ReloadableEntity<String> {
+
+    /**
+     * LDN messages interact with a fictitious queue. Scheduled tasks manage the queue.
+     */
+
+    /*
+     * Notification Type constants
+     */
+    public static final String TYPE_INCOMING = "Incoming";
+    public static final String TYPE_OUTGOING = "Outgoing";
+
+    /**
+     * Message must not be processed.
+     */
+    public static final Integer QUEUE_STATUS_UNTRUSTED_IP = 0;
+
+    /**
+    * Message queued, it has to be elaborated.
+    */
+    public static final Integer QUEUE_STATUS_QUEUED = 1;
+
+    /**
+     * Message has been taken from the queue and it's elaboration is in progress.
+     */
+    public static final Integer QUEUE_STATUS_PROCESSING = 2;
+
+    /**
+     * Message has been correctly elaborated.
+     */
+    public static final Integer QUEUE_STATUS_PROCESSED = 3;
+
+    /**
+     * Message has not been correctly elaborated - despite more than "ldn.processor.max.attempts" retryies
+     */
+    public static final Integer QUEUE_STATUS_FAILED = 4;
+
+    /**
+     * Message must not be processed
+     */
+    public static final Integer QUEUE_STATUS_UNTRUSTED = 5;
+
+    /**
+     * Message is not processed since action is not mapped
+     */
+    public static final Integer QUEUE_STATUS_UNMAPPED_ACTION = 6;
+
+    /**
+     * Message queued for retry, it has to be elaborated.
+     */
+    public static final Integer QUEUE_STATUS_QUEUED_FOR_RETRY = 7;
+
+    @Id
+    private String id;
+
+    @ManyToOne
+    @JoinColumn(name = "object", referencedColumnName = "uuid")
+    private DSpaceObject object;
+
+    @Column(name = "message", columnDefinition = "text")
+    private String message;
+
+    @Column(name = "type")
+    private String type;
+
+    @Column(name = "queue_status")
+    private Integer queueStatus;
+
+    @Column(name = "queue_attempts")
+    private Integer queueAttempts = 0;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "queue_last_start_time")
+    private Date queueLastStartTime = null;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "queue_timeout")
+    private Date queueTimeout = null;
+
+    @ManyToOne
+    @JoinColumn(name = "origin", referencedColumnName = "id")
+    private NotifyServiceEntity origin;
+
+    @ManyToOne
+    @JoinColumn(name = "target", referencedColumnName = "id")
+    private NotifyServiceEntity target;
+
+    @ManyToOne
+    @JoinColumn(name = "inReplyTo", referencedColumnName = "id")
+    private LDNMessageEntity inReplyTo;
+
+    @ManyToOne
+    @JoinColumn(name = "context", referencedColumnName = "uuid")
+    private DSpaceObject context;
+
+    @Column(name = "activity_stream_type")
+    private String activityStreamType;
+
+    @Column(name = "coar_notify_type")
+    private String coarNotifyType;
+
+    @Column(name = "source_ip")
+    private String sourceIp;
+
+    protected LDNMessageEntity() {
+
+    }
+
+    public LDNMessageEntity(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getID() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     * @return the DSpace item related to this message
+     */
+    public DSpaceObject getObject() {
+        return object;
+    }
+
+    public void setObject(DSpaceObject object) {
+        this.object = object;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getActivityStreamType() {
+        return activityStreamType;
+    }
+
+    public void setActivityStreamType(String activityStreamType) {
+        this.activityStreamType = activityStreamType;
+    }
+
+    public String getCoarNotifyType() {
+        return coarNotifyType;
+    }
+
+    public void setCoarNotifyType(String coarNotifyType) {
+        this.coarNotifyType = coarNotifyType;
+    }
+
+    /**
+     * 
+     * @return The originator of the activity, typically the service responsible for sending the notification
+     */
+    public NotifyServiceEntity getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(NotifyServiceEntity origin) {
+        this.origin = origin;
+    }
+
+    /**
+     * 
+     * @return The intended destination of the activity, typically the service which consumes the notification
+     */
+    public NotifyServiceEntity getTarget() {
+        return target;
+    }
+
+    public void setTarget(NotifyServiceEntity target) {
+        this.target = target;
+    }
+
+    /**
+     * 
+     * @return This property is used when the notification is a direct response to a previous notification;
+     * contains an {@link org.dspace.app.ldn.LDNMessageEntity#inReplyTo id}
+     */
+    public LDNMessageEntity getInReplyTo() {
+        return inReplyTo;
+    }
+
+    public void setInReplyTo(LDNMessageEntity inReplyTo) {
+        this.inReplyTo = inReplyTo;
+    }
+
+    /**
+     * 
+     * @return This identifies another resource which is relevant to understanding the notification
+     */
+    public DSpaceObject getContext() {
+        return context;
+    }
+
+    public void setContext(DSpaceObject context) {
+        this.context = context;
+    }
+
+    public Integer getQueueStatus() {
+        return queueStatus;
+    }
+
+    public void setQueueStatus(Integer queueStatus) {
+        this.queueStatus = queueStatus;
+    }
+
+    public Integer getQueueAttempts() {
+        return queueAttempts;
+    }
+
+    public void setQueueAttempts(Integer queueAttempts) {
+        this.queueAttempts = queueAttempts;
+    }
+
+    public Date getQueueLastStartTime() {
+        return queueLastStartTime;
+    }
+
+    public void setQueueLastStartTime(Date queueLastStartTime) {
+        this.queueLastStartTime = queueLastStartTime;
+    }
+
+    public Date getQueueTimeout() {
+        return queueTimeout;
+    }
+
+    public void setQueueTimeout(Date queueTimeout) {
+        this.queueTimeout = queueTimeout;
+    }
+
+    public String getSourceIp() {
+        return sourceIp;
+    }
+
+    public void setSourceIp(String sourceIp) {
+        this.sourceIp = sourceIp;
+    }
+
+    @Override
+    public String toString() {
+        return "LDNMessage id:" + this.getID() + " typed:" + this.getType();
+    }
+
+    public static String getNotificationType(LDNMessageEntity ldnMessage) {
+        // Resubmission outgoing notifications have the inReplyTo, therefore it cannot be used to determine
+        // whether a notification is incoming
+        ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        if (ldnMessage.getOrigin() != null && !ldnMessage.getOrigin().getLdnUrl()
+                .contains(configurationService.getProperty("dspace.ui.url"))) {
+            return TYPE_INCOMING;
+        }
+        return TYPE_OUTGOING;
+    }
+
+    public static String getServiceNameForNotifyServ(NotifyServiceEntity serviceEntity) {
+        if (serviceEntity != null) {
+            return serviceEntity.getName();
+        }
+        return "self";
+    }
+
+    public static String getQueueStatus(LDNMessageEntity ldnMessage) {
+        Class<LDNMessageEntity> cl = LDNMessageEntity.class;
+        try {
+            for (Field f : cl.getDeclaredFields()) {
+                String fieldName = f.getName();
+                if (fieldName.startsWith("QUEUE_") && (f.get(null) == ldnMessage.getQueueStatus())) {
+                    return fieldName;
+                }
+            }
+        } catch (IllegalArgumentException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageQueueStatus.java

@@ -5,10 +5,12 @@
  *
  * http://www.dspace.org/license/
  */
+package org.dspace.app.ldn;
+
+public enum LDNMessageQueueStatus {
 
     /**
- * Support for using DSpace Services in a servlet context.  This is how the
- * kernel and services get started by the servlet container.
+     * Resulting processing status of an LDN Message (aka queue management)
      */
-
-package org.dspace.servicemanager.servlet;
+    QUEUED, PROCESSING, PROCESSED, FAILED;
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNMetadataFields.java

@@ -0,0 +1,38 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+/**
+ * Constants for LDN metadata fields
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public final class LDNMetadataFields {
+
+    // schema and element are the same for each metadata of LDN coar-notify
+    public static final String SCHEMA = "coar";
+    public static final String ELEMENT = "notify";
+
+    // qualifiers
+    public static final String INITIALIZE = "initialize";
+    public static final String REQUEST_REVIEW = "requestreview";
+    public static final String REQUEST_ENDORSEMENT = "requestendorsement";
+    public static final String EXAMINATION = "examination";
+    public static final String REFUSED = "refused";
+    public static final String REVIEW = "review";
+    public static final String ENDORSMENT = "endorsement";
+    public static final String RELEASE = "release";
+
+    /**
+     * 
+     */
+    private LDNMetadataFields() {
+
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueExtractor.java

@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.factory.LDNMessageServiceFactory;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.core.Context;
+
+/**
+ * LDN Message manager: scheduled task invoking extractAndProcessMessageFromQueue() of {@link LDNMessageService}
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class LDNQueueExtractor {
+
+    private static final LDNMessageService ldnMessageService = LDNMessageServiceFactory.getInstance()
+        .getLDNMessageService();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNQueueExtractor.class);
+
+    /**
+     * Default constructor
+     */
+    private LDNQueueExtractor() {
+    }
+
+    /**
+     * invokes
+     * @see org.dspace.app.ldn.service.impl.LDNMessageServiceImpl#extractAndProcessMessageFromQueue(Context)
+     * to process the oldest ldn messages from the queue. An LdnMessage is processed when is routed to a
+     * @see org.dspace.app.ldn.processor.LDNProcessor
+     * Also a +1 is added to the ldnMessage entity
+     * @see org.dspace.app.ldn.LDNMessageEntity#getQueueAttempts()
+     * @return the number of processed ldnMessages.
+     * @throws SQLException
+     */
+    public static int extractMessageFromQueue() throws SQLException {
+        Context context = new Context(Context.Mode.READ_WRITE);
+        int processed_messages = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        if (processed_messages > 0) {
+            log.info("Processed Messages x" + processed_messages);
+        }
+        context.complete();
+        return processed_messages;
+    }
+
+};

dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueTimeoutChecker.java

@@ -0,0 +1,53 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.factory.LDNMessageServiceFactory;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.core.Context;
+
+/**
+ * LDN Message manager: scheduled task invoking checkQueueMessageTimeout() of {@link LDNMessageService}
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class LDNQueueTimeoutChecker {
+
+    private static final LDNMessageService ldnMessageService = LDNMessageServiceFactory.getInstance()
+        .getLDNMessageService();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNQueueTimeoutChecker.class);
+
+    /**
+     * Default constructor
+     */
+    private LDNQueueTimeoutChecker() {
+    }
+
+    /**
+     * invokes
+     * @see org.dspace.app.ldn.service.impl.LDNMessageServiceImpl#checkQueueMessageTimeout(Context)
+     * to refresh the queue status of timed-out and in progressing status ldn messages:
+     * according to their attempts put them back in queue or set their status as failed if maxAttempts
+     * reached.
+     * @return the number of managed ldnMessages.
+     * @throws SQLException
+     */
+    public static int checkQueueMessageTimeout() throws SQLException {
+        Context context = new Context(Context.Mode.READ_WRITE);
+        int fixed_messages = 0;
+        fixed_messages = ldnMessageService.checkQueueMessageTimeout(context);
+        if (fixed_messages > 0) {
+            log.info("Managed Messages x" + fixed_messages);
+        }
+        context.complete();
+        return fixed_messages;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/LDNRouter.java

@@ -0,0 +1,91 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.processor.LDNProcessor;
+
+/**
+ * Linked Data Notification router.
+ */
+public class LDNRouter {
+
+    private Map<Set<String>, LDNProcessor> incomingProcessors = new HashMap<>();
+    private Map<Set<String>, LDNProcessor> outcomingProcessors = new HashMap<>();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNRouter.class);
+
+    /**
+     * Route notification to processor
+     * 
+     * @return LDNProcessor processor to process notification, can be null
+     */
+    public LDNProcessor route(LDNMessageEntity ldnMessage) {
+        if (ldnMessage == null) {
+            log.warn("A null LDNMessage was received and could not be routed.");
+            return null;
+        }
+        if (StringUtils.isEmpty(ldnMessage.getType())) {
+            log.warn("LDNMessage " + ldnMessage + " was received. It has no type, so it couldn't be routed.");
+            return null;
+        }
+        Set<String> ldnMessageTypeSet = new HashSet<String>();
+        ldnMessageTypeSet.add(ldnMessage.getActivityStreamType());
+        ldnMessageTypeSet.add(ldnMessage.getCoarNotifyType());
+
+        LDNProcessor processor = null;
+        if (ldnMessage.getTarget() == null) {
+            processor = incomingProcessors.get(ldnMessageTypeSet);
+        } else if (ldnMessage.getOrigin() == null) {
+            processor = outcomingProcessors.get(ldnMessageTypeSet);
+        }
+
+        return processor;
+    }
+
+    /**
+     * Get all incoming routes.
+     *
+     * @return Map<Set<String>, LDNProcessor>
+     */
+    public Map<Set<String>, LDNProcessor> getIncomingProcessors() {
+        return incomingProcessors;
+    }
+
+    /**
+     * Set all incoming routes.
+     *
+     * @param incomingProcessors
+     */
+    public void setIncomingProcessors(Map<Set<String>, LDNProcessor> incomingProcessors) {
+        this.incomingProcessors = incomingProcessors;
+    }
+
+    /**
+     * Get all outcoming routes.
+     *
+     * @return Map<Set<String>, LDNProcessor>
+     */
+    public Map<Set<String>, LDNProcessor> getOutcomingProcessors() {
+        return outcomingProcessors;
+    }
+
+    /**
+     * Set all outcoming routes.
+     *
+     * @param outcomingProcessors
+     */
+    public void setOutcomingProcessors(Map<Set<String>, LDNProcessor> outcomingProcessors) {
+        this.outcomingProcessors = outcomingProcessors;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/NotifyPatternToTrigger.java

@@ -0,0 +1,82 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.content.Item;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify patterns to be triggered
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifypatterns_to_trigger")
+public class NotifyPatternToTrigger implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifypatterns_to_trigger_id_seq")
+    @SequenceGenerator(name = "notifypatterns_to_trigger_id_seq",
+        sequenceName = "notifypatterns_to_trigger_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @ManyToOne
+    @JoinColumn(name = "item_id", referencedColumnName = "uuid")
+    private Item item;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id", referencedColumnName = "id")
+    private NotifyServiceEntity notifyService;
+
+    @Column(name = "pattern")
+    private String pattern;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+
+    public NotifyServiceEntity getNotifyService() {
+        return notifyService;
+    }
+
+    public void setNotifyService(NotifyServiceEntity notifyService) {
+        this.notifyService = notifyService;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceEntity.java

@@ -0,0 +1,156 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify services
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifyservice")
+public class NotifyServiceEntity implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifyservice_id_seq")
+    @SequenceGenerator(name = "notifyservice_id_seq", sequenceName = "notifyservice_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "description", columnDefinition = "text")
+    private String description;
+
+    @Column(name = "url")
+    private String url;
+
+    @Column(name = "ldn_url")
+    private String ldnUrl;
+
+    @OneToMany(mappedBy = "notifyService")
+    private List<NotifyServiceInboundPattern> inboundPatterns;
+
+    @Column(name = "enabled")
+    private boolean enabled = false;
+
+    @Column(name = "score")
+    private BigDecimal score;
+
+    @Column(name = "lower_ip")
+    private String lowerIp;
+
+    @Column(name = "upper_ip")
+    private String upperIp;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return URL of an informative website
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return URL of the LDN InBox
+     */
+    public String getLdnUrl() {
+        return ldnUrl;
+    }
+
+    public void setLdnUrl(String ldnUrl) {
+        this.ldnUrl = ldnUrl;
+    }
+
+    /**
+     * @return The list of the inbound patterns configuration supported by the service
+     */
+    public List<NotifyServiceInboundPattern> getInboundPatterns() {
+        return inboundPatterns;
+    }
+
+    public void setInboundPatterns(List<NotifyServiceInboundPattern> inboundPatterns) {
+        this.inboundPatterns = inboundPatterns;
+    }
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public String getLowerIp() {
+        return lowerIp;
+    }
+
+    public void setLowerIp(String lowerIp) {
+        this.lowerIp = lowerIp;
+    }
+
+    public String getUpperIp() {
+        return upperIp;
+    }
+
+    public void setUpperIp(String upperIp) {
+        this.upperIp = upperIp;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceInboundPattern.java

@@ -0,0 +1,103 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify service inbound patterns. Every {@link org.dspace.app.ldn.NotifyServiceEntity}
+ * may have inbounds and outbounds. Inbounds are to be sent to the external service.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifyservice_inbound_pattern")
+public class NotifyServiceInboundPattern implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifyservice_inbound_pattern_id_seq")
+    @SequenceGenerator(name = "notifyservice_inbound_pattern_id_seq",
+        sequenceName = "notifyservice_inbound_pattern_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id", referencedColumnName = "id")
+    private NotifyServiceEntity notifyService;
+
+    @Column(name = "pattern")
+    private String pattern;
+
+    @Column(name = "constraint_name")
+    private String constraint;
+
+    @Column(name = "automatic")
+    private boolean automatic;
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public NotifyServiceEntity getNotifyService() {
+        return notifyService;
+    }
+
+    public void setNotifyService(NotifyServiceEntity notifyService) {
+        this.notifyService = notifyService;
+    }
+
+    /**
+     * @see <a href="https://notify.coar-repositories.org/patterns">coar documentation</a>
+     * @return pattern of the inbound notification
+     */
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /**
+     * @return the condition checked for automatic evaluation
+     */
+    public String getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(String constraint) {
+        this.constraint = constraint;
+    }
+
+    /**
+     * when true - the notification is automatically when constraints are respected.
+     * @return the automatic flag
+     */
+    public boolean isAutomatic() {
+        return automatic;
+    }
+
+    public void setAutomatic(boolean automatic) {
+        this.automatic = automatic;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/action/LDNAction.java

@@ -0,0 +1,31 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.action;
+
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * An action that is run after a notification has been processed.
+ */
+public interface LDNAction {
+
+    /**
+     * Execute action for provided notification and item corresponding to the
+     * notification context.
+     *
+     *@param context  the context
+     * @param notification the processed notification to perform action against
+     * @param item         the item corresponding to the notification context
+     * @return ActionStatus the resulting status of the action
+     * @throws Exception general exception that can be thrown while executing action
+     */
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception;
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/action/LDNActionStatus.java

@@ -5,8 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.rest.filter;
+package org.dspace.app.ldn.action;
 
-public interface ItemFilterList {
-    public ItemFilterTest[] getFilters();
+/**
+ * Resulting status of an execution of an action.
+ */
+public enum LDNActionStatus {
+    CONTINUE, ABORT;
 }

dspace-api/src/main/java/org/dspace/app/ldn/action/LDNCorrectionAction.java

@@ -0,0 +1,108 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.action;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation for LDN Correction Action. It creates a QA Event according to the LDN Message received *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class LDNCorrectionAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private String qaEventTopic;
+
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    protected ItemService itemService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private LDNMessageService ldnMessageService;
+    @Autowired
+    private HandleService handleService;
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        String itemName = itemService.getName(item);
+        QAEvent qaEvent = null;
+        if (notification.getObject() != null) {
+            String citeAs = notification.getObject().getIetfCiteAs();
+            if (citeAs == null || citeAs.isEmpty()) {
+                citeAs = notification.getObject().getId();
+            }
+            NotifyMessageDTO message = new NotifyMessageDTO();
+            message.setHref(citeAs);
+            message.setRelationship(notification.getObject().getAsRelationship());
+            if (notification.getOrigin() != null) {
+                message.setServiceId(notification.getOrigin().getId());
+                message.setServiceName(notification.getOrigin().getInbox());
+            }
+            BigDecimal score = getScore(context, notification);
+            double doubleScoreValue = score != null ? score.doubleValue() : 0d;
+            ObjectMapper mapper = new ObjectMapper();
+            qaEvent = new QAEvent(QAEvent.COAR_NOTIFY_SOURCE,
+                handleService.findHandle(context, item), item.getID().toString(), itemName,
+                this.getQaEventTopic(), doubleScoreValue,
+                mapper.writeValueAsString(message),
+                new Date());
+            qaEventService.store(context, qaEvent);
+            result = LDNActionStatus.CONTINUE;
+        }
+
+        return result;
+    }
+
+    private BigDecimal getScore(Context context, Notification notification) throws SQLException {
+
+        if (notification.getOrigin() == null) {
+            return BigDecimal.ZERO;
+        }
+
+        NotifyServiceEntity service = ldnMessageService.findNotifyService(context, notification.getOrigin());
+
+        if (service == null) {
+            return BigDecimal.ZERO;
+        }
+
+        return service.getScore();
+    }
+
+    public String getQaEventTopic() {
+        return qaEventTopic;
+    }
+
+    public void setQaEventTopic(String qaEventTopic) {
+        this.qaEventTopic = qaEventTopic;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/action/LDNEmailAction.java

@@ -0,0 +1,161 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.action;
+
+import static java.lang.String.format;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Action to send email to recipients provided in actionSendFilter. The email
+ * body will be result of templating actionSendFilter.
+ */
+public class LDNEmailAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private final static String DATE_PATTERN = "dd-MM-yyyy HH:mm:ss";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /*
+     * Supported for actionSendFilter are:
+     * - <single email>
+     * - GROUP:<group_name>
+     * - SUBMITTER
+     */
+    private String actionSendFilter;
+
+    // The file name for the requested email
+    private String actionSendEmailTextFile;
+
+    /**
+     * Execute sending an email.
+     *
+     * Template context parameters:
+     *
+     * {0} Service Name
+     * {1} Item Name
+     * {2} Service URL
+     * {3} Item URL
+     * {4} Submitter's Name
+     * {5} Date of the received LDN notification
+     * {6} LDN notification
+     * {7} Item
+     *
+     * @param notification
+     * @param item
+     * @return ActionStatus
+     * @throws Exception
+     */
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        try {
+            Locale supportedLocale = I18nUtil.getEPersonLocale(context.getCurrentUser());
+            Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, actionSendEmailTextFile));
+
+            // Setting recipients email
+            for (String recipient : retrieveRecipientsEmail(item)) {
+                email.addRecipient(recipient);
+            }
+
+            String date = new SimpleDateFormat(DATE_PATTERN).format(Calendar.getInstance().getTime());
+
+            email.addArgument(notification.getActor().getName());
+            email.addArgument(item.getName());
+            email.addArgument(notification.getActor().getId());
+            email.addArgument(notification.getContext() != null ?
+                notification.getContext().getId() : notification.getObject().getId());
+            email.addArgument(item.getSubmitter().getFullName());
+            email.addArgument(date);
+            email.addArgument(notification);
+            email.addArgument(item);
+
+            email.send();
+        } catch (Exception e) {
+            log.error("An Error Occurred while sending a notification email", e);
+        }
+
+        return LDNActionStatus.CONTINUE;
+    }
+
+    /**
+     * @return String
+     */
+    public String getActionSendFilter() {
+        return actionSendFilter;
+    }
+
+    /**
+     * @param actionSendFilter
+     */
+    public void setActionSendFilter(String actionSendFilter) {
+        this.actionSendFilter = actionSendFilter;
+    }
+
+    /**
+     * @return String
+     */
+    public String getActionSendEmailTextFile() {
+        return actionSendEmailTextFile;
+    }
+
+    /**
+     * @param actionSendEmailTextFile
+     */
+    public void setActionSendEmailTextFile(String actionSendEmailTextFile) {
+        this.actionSendEmailTextFile = actionSendEmailTextFile;
+    }
+
+    /**
+     * Parses actionSendFilter for reserved tokens and returns list of email
+     * recipients.
+     *
+     * @param item the item which to get submitter email
+     * @return List<String> list of email recipients
+     */
+    private List<String> retrieveRecipientsEmail(Item item) {
+        List<String> recipients = new LinkedList<String>();
+
+        if (actionSendFilter.startsWith("SUBMITTER")) {
+            if (item.getSubmitter() != null) {
+                recipients.add(item.getSubmitter().getEmail());
+            } else {
+                // Fallback configured option
+                recipients.add(configurationService.getProperty("ldn.notification.email.submitter.fallback"));
+            }
+
+        } else if (actionSendFilter.startsWith("GROUP:")) {
+            String groupName = actionSendFilter.replace("GROUP:", "");
+            String property = format("email.%s.list", groupName);
+            String[] groupEmails = configurationService.getArrayProperty(property);
+            recipients = Arrays.asList(groupEmails);
+        } else {
+            recipients.add(actionSendFilter);
+        }
+
+        return recipients;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/action/LDNRelationCorrectionAction.java

@@ -0,0 +1,110 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.action;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.Set;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation for LDN Correction Action. It creates a QA Event according to the LDN Message received *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class LDNRelationCorrectionAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private String qaEventTopic;
+
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    protected ItemService itemService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private LDNMessageService ldnMessageService;
+    @Autowired
+    private HandleService handleService;
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        String itemName = itemService.getName(item);
+        QAEvent qaEvent = null;
+        if (notification.getObject() != null) {
+            NotifyMessageDTO message = new NotifyMessageDTO();
+            if (notification.getType().containsAll(Set.of("Announce",
+                "coar-notify:RelationshipAction"))) {
+                message.setHref(notification.getObject().getAsSubject());
+            } else {
+                message.setHref(notification.getObject().getAsObject());
+            }
+            message.setRelationship(notification.getObject().getAsRelationship());
+            if (notification.getOrigin() != null) {
+                message.setServiceId(notification.getOrigin().getId());
+                message.setServiceName(notification.getOrigin().getInbox());
+            }
+            BigDecimal score = getScore(context, notification);
+            double doubleScoreValue = score != null ? score.doubleValue() : 0d;
+            ObjectMapper mapper = new ObjectMapper();
+            qaEvent = new QAEvent(QAEvent.COAR_NOTIFY_SOURCE,
+                handleService.findHandle(context, item), item.getID().toString(), itemName,
+                this.getQaEventTopic(), doubleScoreValue,
+                mapper.writeValueAsString(message),
+                new Date());
+            qaEventService.store(context, qaEvent);
+            result = LDNActionStatus.CONTINUE;
+        }
+
+        return result;
+    }
+
+    private BigDecimal getScore(Context context, Notification notification) throws SQLException {
+
+        if (notification.getOrigin() == null) {
+            return BigDecimal.ZERO;
+        }
+
+        NotifyServiceEntity service = ldnMessageService.findNotifyService(context, notification.getOrigin());
+
+        if (service == null) {
+            return BigDecimal.ZERO;
+        }
+
+        return service.getScore();
+    }
+
+    public String getQaEventTopic() {
+        return qaEventTopic;
+    }
+
+    public void setQaEventTopic(String qaEventTopic) {
+        this.qaEventTopic = qaEventTopic;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/action/SendLDNMessageAction.java

@@ -0,0 +1,109 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.action;
+
+import java.net.URI;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.Header;
+import org.apache.http.HttpException;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.client.DSpaceHttpClientFactory;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Action to send LDN Message
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class SendLDNMessageAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(SendLDNMessageAction.class);
+
+    private CloseableHttpClient client;
+
+    public SendLDNMessageAction() {
+    }
+
+    public SendLDNMessageAction(CloseableHttpClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        //TODO authorization with Bearer token should be supported.
+
+        String url = notification.getTarget().getInbox();
+
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Content-Type", "application/ld+json");
+        ObjectMapper mapper = new ObjectMapper();
+        httpPost.setEntity(new StringEntity(mapper.writeValueAsString(notification), "UTF-8"));
+
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        // NOTE: Github believes there is a "Potential server-side request forgery due to a user-provided value"
+        // This is a false positive because the LDN Service URL is configured by the user from DSpace.
+        // See the frontend configuration at [dspace.ui.url]/admin/ldn/services
+        if (client == null) {
+            client = DSpaceHttpClientFactory.getInstance().buildWithoutAutomaticRetries(5);
+        }
+        try (CloseableHttpResponse response = client.execute(httpPost)) {
+            if (isSuccessful(response.getStatusLine().getStatusCode())) {
+                result = LDNActionStatus.CONTINUE;
+            } else if (isRedirect(response.getStatusLine().getStatusCode())) {
+                result = handleRedirect(response, httpPost);
+            }
+        } catch (Exception e) {
+            log.error(e);
+        }
+        client.close();
+        return result;
+    }
+
+    private boolean isSuccessful(int statusCode) {
+        return statusCode == HttpStatus.SC_ACCEPTED ||
+            statusCode == HttpStatus.SC_CREATED;
+    }
+
+    private boolean isRedirect(int statusCode) {
+        //org.apache.http.HttpStatus has no enum value for 308!
+        return statusCode == (HttpStatus.SC_TEMPORARY_REDIRECT + 1) ||
+            statusCode == HttpStatus.SC_TEMPORARY_REDIRECT;
+    }
+
+    private LDNActionStatus handleRedirect(CloseableHttpResponse oldResponse,
+                                        HttpPost request) throws HttpException {
+        Header[] urls = oldResponse.getHeaders(HttpHeaders.LOCATION);
+        String url = urls.length > 0 && urls[0] != null ? urls[0].getValue() : null;
+        if (url == null) {
+            throw new HttpException("Error following redirect, unable to reach"
+                + " the correct url.");
+        }
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        try {
+            request.setURI(new URI(url));
+            try (CloseableHttpResponse response = client.execute(request)) {
+                if (isSuccessful(response.getStatusLine().getStatusCode())) {
+                    result = LDNActionStatus.CONTINUE;
+                }
+            }
+        } catch (Exception e) {
+            log.error("Error following redirect:", e);
+        }
+        return result;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java

@@ -0,0 +1,76 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * Database Access Object interface class for the LDNMessage object.
+ *
+ * The implementation of this class is responsible for all database calls for
+ * the LDNMessage object and is autowired by spring
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface LDNMessageDao extends GenericDAO<LDNMessageEntity> {
+
+    /**
+     * load the oldest ldn messages considering their {@link org.dspace.app.ldn.LDNMessageEntity#queueLastStartTime}
+     * @param context
+     * @param max_attempts consider ldn_message entity with queue_attempts <= max_attempts
+     * @return ldn message entities to be routed
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findOldestMessageToProcess(Context context, int max_attempts) throws SQLException;
+
+    /**
+     * find ldn message entties in processing status and already timed out.
+     * @param context
+     * @param max_attempts consider ldn_message entity with queue_attempts <= max_attempts
+     * @return ldn message entities
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context, int max_attempts) throws SQLException;
+
+    /**
+     * find all ldn messages related to an item
+     * @param context
+     * @param item item related to the returned ldn messages
+     * @param activities involves only this specific group of activities
+     * @return all ldn messages related to the given item
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findAllMessagesByItem(
+        Context context, Item item, String... activities) throws SQLException;
+
+    /**
+     * find all ldn messages related to an item and to a specific ldn message
+     * @param context
+     * @param msg the referring ldn message
+     * @param item the referring repository item
+     * @param relatedTypes filter for @see org.dspace.app.ldn.LDNMessageEntity#activityStreamType
+     * @return all related ldn messages
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findAllRelatedMessagesByItem(
+        Context context, LDNMessageEntity msg, Item item, String... relatedTypes) throws SQLException;
+
+    /**
+     *
+     * @param context
+     * @return the list of messages in need to be reprocessed - with queue_status as QUEUE_STATUS_QUEUED_FOR_RETRY
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException;
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyPatternToTriggerDao.java

@@ -0,0 +1,49 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyPatternToTrigger} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyPatternToTriggerDao extends GenericDAO<NotifyPatternToTrigger> {
+
+    /**
+     * find the NotifyPatternToTrigger matched with the provided item
+     *
+     * @param context the context
+     * @param item the item
+     * @return the NotifyPatternToTrigger matched the provided item
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item) throws SQLException;
+
+    /**
+     * find the NotifyPatternToTrigger matched with the provided
+     * item and pattern
+     *
+     * @param context the context
+     * @param item the item
+     * @param pattern the pattern
+     * @return the NotifyPatternToTrigger matched the provided
+     * item and pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException;
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceDao.java

@@ -0,0 +1,45 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyServiceEntity} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceDao extends GenericDAO<NotifyServiceEntity> {
+    /**
+     * find the NotifyServiceEntity matched with the provided ldnUrl
+     *
+     * @param context the context
+     * @param ldnUrl the ldnUrl
+     * @return the NotifyServiceEntity matched the provided ldnUrl
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException;
+
+    /**
+     * find all NotifyServiceEntity matched the provided inbound pattern
+     * from the related notifyServiceInboundPatterns
+     * also with 'automatic' equals to false
+     *
+     * @param context the context
+     * @param pattern the ldnUrl
+     * @return all NotifyServiceEntity matched the provided pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException;
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceInboundPatternDao.java

@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyServiceInboundPattern} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceInboundPatternDao extends GenericDAO<NotifyServiceInboundPattern> {
+
+    /**
+     * find all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @param pattern the pattern
+     * @return all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException;
+    /**
+     * find all automatic notifyServiceInboundPatterns
+     *
+     * @param context the context
+     * @return all automatic notifyServiceInboundPatterns
+     * @throws SQLException if database error
+     */
+    List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException;
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/LDNMessageDaoImpl.java

@@ -0,0 +1,172 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.LDNMessageEntity_;
+import org.dspace.app.ldn.dao.LDNMessageDao;
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Hibernate implementation of the Database Access Object interface class for
+ * the LDNMessage object. This class is responsible for all database calls for
+ * the LDNMessage object and is autowired by spring
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageDaoImpl extends AbstractHibernateDAO<LDNMessageEntity> implements LDNMessageDao {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNMessageDaoImpl.class);
+
+    @Override
+    public List<LDNMessageEntity> findOldestMessageToProcess(Context context, int max_attempts) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(3);
+        andPredicates
+            .add(criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_QUEUED));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueAttempts), max_attempts));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueTimeout), new Date()));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException {
+        // looking for LDN Messages to be reprocessed message
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(1);
+        andPredicates
+            .add(criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus),
+                LDNMessageEntity.QUEUE_STATUS_QUEUED_FOR_RETRY));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context, int max_attempts)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(3);
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSING));
+        andPredicates.add(criteriaBuilder.lessThanOrEqualTo(root.get(LDNMessageEntity_.queueAttempts), max_attempts));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueTimeout), new Date()));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAllRelatedMessagesByItem(
+        Context context, LDNMessageEntity msg, Item item, String... relatedTypes) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>();
+        Predicate relatedtypePredicate = null;
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSED));
+        andPredicates.add(
+            criteriaBuilder.isNull(root.get(LDNMessageEntity_.target)));
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.inReplyTo), msg));
+        if (relatedTypes != null && relatedTypes.length > 0) {
+            relatedtypePredicate = root.get(LDNMessageEntity_.activityStreamType).in(relatedTypes);
+            andPredicates.add(relatedtypePredicate);
+        }
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages ACK found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAllMessagesByItem(
+        Context context, Item item, String... activities) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>();
+        Predicate activityPredicate = null;
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSED));
+        // Added OR with object or context - inbound notifications make use of the context item to provide information
+        // about the repository item the notification refers to
+        andPredicates.add(
+                criteriaBuilder.or(criteriaBuilder.equal(root.get(LDNMessageEntity_.object), item),
+                        criteriaBuilder.equal(root.get(LDNMessageEntity_.context), item)));
+        if (activities != null && activities.length > 0) {
+            activityPredicate = root.get(LDNMessageEntity_.activityStreamType).in(activities);
+            andPredicates.add(activityPredicate);
+        }
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found");
+        }
+        return result;
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyPatternToTriggerDaoImpl.java

@@ -0,0 +1,58 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyPatternToTrigger_;
+import org.dspace.app.ldn.dao.NotifyPatternToTriggerDao;
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyPatternToTriggerDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyPatternToTriggerDaoImpl extends AbstractHibernateDAO<NotifyPatternToTrigger>
+    implements NotifyPatternToTriggerDao {
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyPatternToTrigger.class);
+        Root<NotifyPatternToTrigger> notifyServiceEntityRoot = criteriaQuery.from(NotifyPatternToTrigger.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyPatternToTrigger_.item), item));
+        return list(context, criteriaQuery, false, NotifyPatternToTrigger.class, -1, -1);
+    }
+    @Override
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyPatternToTrigger.class);
+        Root<NotifyPatternToTrigger> notifyServiceEntityRoot = criteriaQuery.from(NotifyPatternToTrigger.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyPatternToTrigger_.item), item),
+            criteriaBuilder.equal(
+                notifyServiceEntityRoot.get(NotifyPatternToTrigger_.pattern), pattern)
+            ));
+        return list(context, criteriaQuery, false, NotifyPatternToTrigger.class, -1, -1);
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceDaoImpl.java

@@ -0,0 +1,62 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceEntity_;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.NotifyServiceInboundPattern_;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyServiceDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceDaoImpl extends AbstractHibernateDAO<NotifyServiceEntity> implements NotifyServiceDao {
+
+    @Override
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceEntity.class);
+        Root<NotifyServiceEntity> notifyServiceEntityRoot = criteriaQuery.from(NotifyServiceEntity.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyServiceEntity_.ldnUrl), ldnUrl));
+        return uniqueResult(context, criteriaQuery, false, NotifyServiceEntity.class);
+    }
+
+    @Override
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceEntity.class);
+        Root<NotifyServiceEntity> notifyServiceEntityRoot = criteriaQuery.from(NotifyServiceEntity.class);
+
+        Join<NotifyServiceEntity, NotifyServiceInboundPattern> notifyServiceInboundPatternJoin =
+            notifyServiceEntityRoot.join(NotifyServiceEntity_.inboundPatterns);
+
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+                criteriaBuilder.equal(
+                    notifyServiceInboundPatternJoin.get(NotifyServiceInboundPattern_.pattern), pattern),
+                criteriaBuilder.equal(
+                    notifyServiceInboundPatternJoin.get(NotifyServiceInboundPattern_.automatic), false)));
+
+        return list(context, criteriaQuery, false, NotifyServiceEntity.class, -1, -1);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceInboundPatternDaoImpl.java

@@ -0,0 +1,59 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.NotifyServiceInboundPattern_;
+import org.dspace.app.ldn.dao.NotifyServiceInboundPatternDao;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyServiceInboundPatternDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceInboundPatternDaoImpl
+    extends AbstractHibernateDAO<NotifyServiceInboundPattern> implements NotifyServiceInboundPatternDao {
+
+    @Override
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context, NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceInboundPattern.class);
+        Root<NotifyServiceInboundPattern> inboundPatternRoot = criteriaQuery.from(NotifyServiceInboundPattern.class);
+        criteriaQuery.select(inboundPatternRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.notifyService), notifyServiceEntity),
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.pattern), pattern)
+        ));
+        return uniqueResult(context, criteriaQuery, false, NotifyServiceInboundPattern.class);
+    }
+
+    @Override
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceInboundPattern.class);
+        Root<NotifyServiceInboundPattern> inboundPatternRoot = criteriaQuery.from(NotifyServiceInboundPattern.class);
+        criteriaQuery.select(inboundPatternRoot);
+        criteriaQuery.where(
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.automatic), true)
+        );
+        return list(context, criteriaQuery, false, NotifyServiceInboundPattern.class, -1, -1);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactory.java

@@ -0,0 +1,29 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the NotifyService package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public abstract class LDNMessageServiceFactory {
+
+    public abstract LDNMessageService getLDNMessageService();
+
+    public static LDNMessageServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance()
+                .getServiceManager()
+                .getServiceByName("ldnMessageServiceFactory",
+                    LDNMessageServiceFactory.class);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactoryImpl.java

@@ -0,0 +1,29 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the notifyservices package, use
+ * NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public class LDNMessageServiceFactoryImpl extends LDNMessageServiceFactory {
+
+    @Autowired(required = true)
+    private LDNMessageService ldnMessageService;
+
+    @Override
+    public LDNMessageService getLDNMessageService() {
+        return ldnMessageService;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactory.java

@@ -0,0 +1,29 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.LDNRouter;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the ldn package, use
+ * LDNRouterFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public abstract class LDNRouterFactory {
+
+    public abstract LDNRouter getLDNRouter();
+
+    public static LDNRouterFactory getInstance() {
+        return DSpaceServicesFactory.getInstance()
+            .getServiceManager()
+            .getServiceByName("ldnRouter",
+                LDNRouterFactory.class);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactoryImpl.java

@@ -0,0 +1,28 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.LDNRouter;
+import org.springframework.beans.factory.annotation.Autowired;
+/**
+ * Factory implementation to get services for the ldn package,
+ * use ldnRouter spring bean instance to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (mohamed.eskander at 4science.com)
+ */
+public class LDNRouterFactoryImpl extends LDNRouterFactory {
+
+    @Autowired(required = true)
+    private LDNRouter ldnRouter;
+
+    @Override
+    public LDNRouter getLDNRouter() {
+        return ldnRouter;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactory.java

@@ -0,0 +1,36 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the NotifyService package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public abstract class NotifyServiceFactory {
+
+    public abstract NotifyService getNotifyService();
+
+    public abstract NotifyServiceInboundPatternService getNotifyServiceInboundPatternService();
+
+    public abstract NotifyPatternToTriggerService getNotifyPatternToTriggerService();
+
+    public abstract LDNMessageService getLDNMessageService();
+
+    public static NotifyServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+            "notifyServiceFactory", NotifyServiceFactory.class);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactoryImpl.java

@@ -0,0 +1,56 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the notifyservices package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceFactoryImpl extends NotifyServiceFactory {
+
+    @Autowired(required = true)
+    private NotifyService notifyService;
+
+    @Autowired(required = true)
+    private NotifyServiceInboundPatternService notifyServiceInboundPatternService;
+
+    @Autowired(required = true)
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Autowired(required = true)
+    private LDNMessageService ldnMessageService;
+
+    @Override
+    public NotifyService getNotifyService() {
+        return notifyService;
+    }
+
+    @Override
+    public NotifyServiceInboundPatternService getNotifyServiceInboundPatternService() {
+        return notifyServiceInboundPatternService;
+    }
+
+    @Override
+    public NotifyPatternToTriggerService getNotifyPatternToTriggerService() {
+        return notifyPatternToTriggerService;
+    }
+
+    @Override
+    public LDNMessageService getLDNMessageService() {
+        return ldnMessageService;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Actor.java

@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Actor extends Base {
+
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * 
+     */
+    public Actor() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Base.java

@@ -0,0 +1,115 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+@JsonInclude(Include.NON_EMPTY)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Base {
+
+    @JsonProperty("id")
+    private String id;
+
+    @JsonProperty("type")
+    private Set<String> type;
+
+    /**
+     * 
+     */
+    public Base() {
+        type = new HashSet<>();
+    }
+
+    /**
+     * @return String
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return Set<String>
+     */
+    public Set<String> getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(java.lang.Object type) {
+        if (type instanceof String) {
+            this.type.add((String) type);
+        } else if (type instanceof Collection) {
+            this.type.addAll((Collection) type);
+        }
+    }
+
+    /**
+     * @param type
+     */
+    public void addType(String type) {
+        this.type.add(type);
+    }
+
+    /**
+     * @return int
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    /**
+     * @param obj
+     * @return boolean
+     */
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Base other = (Base) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        return true;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Citation.java

@@ -0,0 +1,59 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Citation extends Base {
+
+    @JsonProperty("ietf:cite-as")
+    private String ietfCiteAs;
+
+    @JsonProperty("ietf:item")
+    private Url url;
+
+    /**
+     * 
+     */
+    public Citation() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getIetfCiteAs() {
+        return ietfCiteAs;
+    }
+
+    /**
+     * @param ietfCiteAs
+     */
+    public void setIetfCiteAs(String ietfCiteAs) {
+        this.ietfCiteAs = ietfCiteAs;
+    }
+
+    /**
+     * @return Url
+     */
+    public Url getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url
+     */
+    public void setUrl(Url url) {
+        this.url = url;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Context.java

@@ -0,0 +1,61 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Context extends Citation {
+
+    @JsonProperty("IsSupplementedBy")
+    private List<Context> isSupplementedBy;
+
+    @JsonProperty("IsSupplementTo")
+    private List<Context> isSupplementTo;
+
+    /**
+     * 
+     */
+    public Context() {
+        super();
+    }
+
+    /**
+     * @return List<Context>
+     */
+    public List<Context> getIsSupplementedBy() {
+        return isSupplementedBy;
+    }
+
+    /**
+     * @param isSupplementedBy
+     */
+    public void setIsSupplementedBy(List<Context> isSupplementedBy) {
+        this.isSupplementedBy = isSupplementedBy;
+    }
+
+    /**
+     * @return List<Context>
+     */
+    public List<Context> getIsSupplementTo() {
+        return isSupplementTo;
+    }
+
+    /**
+     * @param isSupplementTo
+     */
+    public void setIsSupplementTo(List<Context> isSupplementTo) {
+        this.isSupplementTo = isSupplementTo;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Notification.java

@@ -0,0 +1,159 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * the json object from witch @see org.dspace.app.ldn.LDNMessageEntity are created.
+ * <a href="https://notify.coar-repositories.org/patterns/">see official coar doc</a>
+ */
+@JsonPropertyOrder(value = {
+    "@context",
+    "id",
+    "type",
+    "actor",
+    "context",
+    "object",
+    "origin",
+    "target",
+    "inReplyTo"
+})
+public class Notification extends Base {
+
+    @JsonProperty("@context")
+    private String[] c = new String[] {
+        "https://purl.org/coar/notify",
+        "https://www.w3.org/ns/activitystreams"
+    };
+
+    @JsonProperty("actor")
+    private Actor actor;
+
+    @JsonProperty("context")
+    private Context context;
+
+    @JsonProperty("object")
+    private Object object;
+
+    @JsonProperty("origin")
+    private Service origin;
+
+    @JsonProperty("target")
+    private Service target;
+
+    @JsonProperty("inReplyTo")
+    private String inReplyTo;
+
+    /**
+     * 
+     */
+    public Notification() {
+        super();
+    }
+
+    /**
+     * @return String[]
+     */
+    public String[] getC() {
+        return c;
+    }
+
+    /**
+     * @param c
+     */
+    public void setC(String[] c) {
+        this.c = c;
+    }
+
+    /**
+     * @return Actor
+     */
+    public Actor getActor() {
+        return actor;
+    }
+
+    /**
+     * @param actor
+     */
+    public void setActor(Actor actor) {
+        this.actor = actor;
+    }
+
+    /**
+     * @return Context
+     */
+    public Context getContext() {
+        return context;
+    }
+
+    /**
+     * @param context
+     */
+    public void setContext(Context context) {
+        this.context = context;
+    }
+
+    /**
+     * @return Object
+     */
+    public Object getObject() {
+        return object;
+    }
+
+    /**
+     * @param object
+     */
+    public void setObject(Object object) {
+        this.object = object;
+    }
+
+    /**
+     * @return Service
+     */
+    public Service getOrigin() {
+        return origin;
+    }
+
+    /**
+     * @param origin
+     */
+    public void setOrigin(Service origin) {
+        this.origin = origin;
+    }
+
+    /**
+     * @return Service
+     */
+    public Service getTarget() {
+        return target;
+    }
+
+    /**
+     * @param target
+     */
+    public void setTarget(Service target) {
+        this.target = target;
+    }
+
+    /**
+     * @return String
+     */
+    public String getInReplyTo() {
+        return inReplyTo;
+    }
+
+    /**
+     * @param inReplyTo
+     */
+    public void setInReplyTo(String inReplyTo) {
+        this.inReplyTo = inReplyTo;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatus.java

@@ -0,0 +1,63 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder(value = {
+    "itemuuid",
+    "notifyStatus"
+})
+
+/**
+ * item requests of LDN messages of type
+ *
+ *    "Offer", "coar-notify:EndorsementAction"
+ *    "Offer", "coar-notify:IngestAction"
+ *    "Offer", "coar-notify:ReviewAction"
+ * 
+ * and their acknowledgements - if any
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class NotifyRequestStatus extends Base {
+
+    private UUID itemUuid;
+
+    private List<RequestStatus> notifyStatus;
+
+    public NotifyRequestStatus() {
+        super();
+        this.notifyStatus = new ArrayList<RequestStatus>();
+    }
+
+    public UUID getItemUuid() {
+        return itemUuid;
+    }
+
+    public void setItemUuid(UUID itemUuid) {
+        this.itemUuid = itemUuid;
+    }
+
+    public void addRequestStatus(RequestStatus rs) {
+        this.notifyStatus.add(rs);
+    }
+
+    public List<RequestStatus> getNotifyStatus() {
+        return notifyStatus;
+    }
+
+    public void setNotifyStatus(List<RequestStatus> notifyStatus) {
+        this.notifyStatus = notifyStatus;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatusEnum.java

@@ -0,0 +1,19 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+/**
+ * REQUESTED means acknowledgements not received yet
+ * ACCEPTED means acknowledgements of "Accept" or "TentativeAccept" type received
+ * REJECTED means ack of "Reject" type received
+ * TENTATIVE_REJECT means ack of "TentativeReject" type received
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public enum NotifyRequestStatusEnum {
+    REJECTED, ACCEPTED, REQUESTED, TENTATIVE_REJECT
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Object.java

@@ -0,0 +1,74 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Object extends Citation {
+
+    @JsonProperty("as:object")
+    private String asObject;
+
+    @JsonProperty("as:relationship")
+    private String asRelationship;
+
+    @JsonProperty("as:subject")
+    private String asSubject;
+
+    @JsonProperty("sorg:name")
+    private String title;
+
+    /**
+     * 
+     */
+    public Object() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @param title
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAsObject() {
+        return asObject;
+    }
+
+    public void setAsObject(String asObject) {
+        this.asObject = asObject;
+    }
+
+    public String getAsRelationship() {
+        return asRelationship;
+    }
+
+    public void setAsRelationship(String asRelationship) {
+        this.asRelationship = asRelationship;
+    }
+
+    public String getAsSubject() {
+        return asSubject;
+    }
+
+    public void setAsSubject(String asSubject) {
+        this.asSubject = asSubject;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/RequestStatus.java

@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+/**
+ * Information about the Offer and Acknowledgements targeting a specified Item
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public class RequestStatus {
+
+    private String serviceName;
+    private String serviceUrl;
+    private String offerType;
+    private NotifyRequestStatusEnum status;
+
+    public String getServiceName() {
+        return serviceName;
+    }
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+    public String getServiceUrl() {
+        return serviceUrl;
+    }
+    public void setServiceUrl(String serviceUrl) {
+        this.serviceUrl = serviceUrl;
+    }
+    public NotifyRequestStatusEnum getStatus() {
+        return status;
+    }
+    public void setStatus(NotifyRequestStatusEnum status) {
+        this.status = status;
+    }
+    public String getOfferType() {
+        return offerType;
+    }
+    public void setOfferType(String offerType) {
+        this.offerType = offerType;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Service.java

@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Service extends Base {
+
+    @JsonProperty("inbox")
+    private String inbox;
+
+    /**
+     * 
+     */
+    public Service() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getInbox() {
+        return inbox;
+    }
+
+    /**
+     * @param inbox
+     */
+    public void setInbox(String inbox) {
+        this.inbox = inbox;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/model/Url.java

@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Citation
+ */
+public class Url extends Base {
+
+    @JsonProperty("mediaType")
+    private String mediaType;
+
+    /**
+     * 
+     */
+    public Url() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getMediaType() {
+        return mediaType;
+    }
+
+    /**
+     * @param mediaType
+     */
+    public void setMediaType(String mediaType) {
+        this.mediaType = mediaType;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNContextRepeater.java

@@ -0,0 +1,141 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.processor;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.Context;
+import org.dspace.app.ldn.model.Notification;
+
+/**
+ * Context repeater to iterate over array context properties of a received
+ * notification. The returned notification iterator is a notification with
+ * context array elements hoisted onto the root of the notification context.
+ */
+public class LDNContextRepeater {
+
+    private final static Logger log = LogManager.getLogger(LDNContextRepeater.class);
+
+    private final static String CONTEXT = "context";
+
+    private String repeatOver;
+
+    /**
+     * @return String
+     */
+    public String getRepeatOver() {
+        return repeatOver;
+    }
+
+    /**
+     * @param repeatOver
+     */
+    public void setRepeatOver(String repeatOver) {
+        this.repeatOver = repeatOver;
+    }
+
+    /**
+     * @param  notification
+     * @return Iterator<Notification>
+     */
+    public Iterator<Notification> iterator(Notification notification) {
+        return new NotificationIterator(notification, repeatOver);
+    }
+
+    /**
+     * Private inner class defining the notification iterator.
+     */
+    private class NotificationIterator implements Iterator<Notification> {
+
+        private final List<Notification> notifications;
+
+        /**
+         * Convert notification to JsonNode in order to clone for each context array
+         * element. Each element is then hoisted to the root of the cloned notification
+         * context.
+         *
+         * @param notification received notification
+         * @param repeatOver   which context property to repeat over
+         */
+        private NotificationIterator(Notification notification, String repeatOver) {
+            this.notifications = new ArrayList<>();
+
+            if (Objects.nonNull(repeatOver)) {
+                ObjectMapper objectMapper = new ObjectMapper();
+
+                JsonNode notificationNode = objectMapper.valueToTree(notification);
+
+                log.debug("Notification {}", notificationNode);
+
+                JsonNode topContextNode = notificationNode.get(CONTEXT);
+                if (topContextNode.isNull()) {
+                    log.warn("Notification is missing context");
+                    return;
+                }
+
+                JsonNode contextArrayNode = topContextNode.get(repeatOver);
+                if (contextArrayNode == null || contextArrayNode.isNull()) {
+                    log.error("Notification context {} is not defined", repeatOver);
+                    return;
+                }
+
+                if (contextArrayNode.isArray()) {
+
+                    for (JsonNode contextNode : ((ArrayNode) contextArrayNode)) {
+
+                        try {
+                            Context context = objectMapper.treeToValue(contextNode, Context.class);
+
+                            Notification copy = objectMapper.treeToValue(notificationNode, Notification.class);
+
+                            copy.setContext(context);
+
+                            this.notifications.add(copy);
+                        } catch (JsonProcessingException e) {
+                            log.error("Failed to copy notification");
+                        }
+
+                    }
+
+                } else {
+                    log.error("Notification context {} is not an array", repeatOver);
+                }
+
+            } else {
+                this.notifications.add(notification);
+            }
+        }
+
+        /**
+         * @return boolean
+         */
+        @Override
+        public boolean hasNext() {
+            return !this.notifications.isEmpty();
+        }
+
+        /**
+         * @return Notification
+         */
+        @Override
+        public Notification next() {
+            return this.notifications.remove(0);
+        }
+
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNMetadataProcessor.java

@@ -0,0 +1,249 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.processor;
+
+import static java.lang.String.format;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpResponseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.action.LDNAction;
+import org.dspace.app.ldn.action.LDNActionStatus;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.utility.LDNUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Linked Data Notification metadata processor for consuming notifications. The
+ * storage of notification details are within item metadata.
+ */
+public class LDNMetadataProcessor implements LDNProcessor {
+
+    private final static Logger log = LogManager.getLogger(LDNMetadataProcessor.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private static final Set<String> OBJECT_SUBJECT_ITEM_TYPES = Set.of(
+        "Announce",
+        "coar-notify:RelationshipAction");
+
+    private static final Set<String> CONTEXT_ID_ITEM_TYPES = Set.of(
+        "Announce",
+        "TentativeReject",
+        "Accept",
+        "TentativeAccept",
+        "Reject",
+        "coar-notify:ReviewAction",
+        "coar-notify:IngestAction",
+        "coar-notify:EndorsementAction");
+
+    private static final Set<String> OBJECT_ID_ITEM_TYPES = Set.of(
+        "Offer",
+        "coar-notify:ReviewAction",
+        "coar-notify:EndorsementAction",
+        "coar-notify:IngestAction");
+
+    @Autowired
+    private HandleService handleService;
+
+    private LDNContextRepeater repeater = new LDNContextRepeater();
+
+    private List<LDNAction> actions = new ArrayList<>();
+
+    /**
+     * Initialize velocity engine for templating.
+     */
+    private LDNMetadataProcessor() {
+
+    }
+
+    /**
+     * Process notification by repeating over context, processing each context
+     * notification, and running actions post processing.
+     *
+     * @param notification received notification
+     * @throws Exception something went wrong processing the notification
+     */
+    @Override
+    public void process(Context context, Notification notification) throws Exception {
+        Item item = lookupItem(context, notification);
+        runActions(context, notification, item);
+    }
+
+    /**
+     * Run all actions defined for the processor.
+     *
+     * @param notification current context notification
+     * @param item         associated item
+     *
+     * @return ActionStatus result status of running the action
+     *
+     * @throws Exception failed execute the action
+     */
+    private LDNActionStatus runActions(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus operation = LDNActionStatus.CONTINUE;
+        for (LDNAction action : actions) {
+            log.info("Running action {} for notification {} {}",
+                    action.getClass().getSimpleName(),
+                    notification.getId(),
+                    notification.getType());
+
+            operation = action.execute(context, notification, item);
+            if (operation == LDNActionStatus.ABORT) {
+                break;
+            }
+        }
+
+        return operation;
+    }
+
+    /**
+     * @return LDNContextRepeater
+     */
+    public LDNContextRepeater getRepeater() {
+        return repeater;
+    }
+
+    /**
+     * @param repeater
+     */
+    public void setRepeater(LDNContextRepeater repeater) {
+        this.repeater = repeater;
+    }
+
+    /**
+     * @return List<LDNAction>
+     */
+    public List<LDNAction> getActions() {
+        return actions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setActions(List<LDNAction> actions) {
+        this.actions = actions;
+    }
+
+    /**
+     * Lookup associated item to the notification context. If UUID in URL, lookup by
+     * UUID, else lookup by handle.
+     *
+     * @param context      current context
+     * @param notification current context notification
+     *
+     * @return Item associated item
+     *
+     * @throws SQLException failed to lookup item
+     * @throws HttpResponseException redirect failure
+     */
+    private Item lookupItem(Context context, Notification notification) throws SQLException, HttpResponseException {
+        Item item = null;
+        String url = null;
+
+        if (CONTEXT_ID_ITEM_TYPES.containsAll(notification.getType())) {
+            if (notification.getContext() != null) {
+                url = notification.getContext().getId();
+            } else if (notification.getInReplyTo() != null) {
+                // Find context information (the item this notification relates to) via the inReplyTo notification ID
+                LDNMessageEntity inReplyToldnMessageEntity =
+                        ldnMessageService.find(context, notification.getInReplyTo());
+                if (inReplyToldnMessageEntity != null) {
+                    String dspaceUrl = configurationService.getProperty("dspace.ui.url")
+                            + "/handle/";
+                    url = dspaceUrl + inReplyToldnMessageEntity.getObject().getHandle();
+                    // Set context based on the inReplyTo and update in DB
+                    LDNMessageEntity ldnMessageEntity = ldnMessageService.find(context, notification.getId());
+                    ldnMessageEntity.setContext(inReplyToldnMessageEntity.getObject());
+                    ldnMessageService.update(context, ldnMessageEntity);
+                }
+            }
+        } else if (OBJECT_ID_ITEM_TYPES.containsAll(notification.getType())) {
+            url = notification.getObject().getId();
+        } else if (OBJECT_SUBJECT_ITEM_TYPES.containsAll(notification.getType())) {
+            // need to understand if we're sender or receiver
+            if (ldnMessageService.isTargetCurrent(notification)) {
+                // this means we're sending the notification
+                url = notification.getObject().getAsObject();
+                // use as:object for sender
+            } else {
+                // this means we're receiving the notification
+                url = notification.getObject().getAsSubject();
+                // use as:subject for receiver
+            }
+        }
+
+        log.info("Looking up item {}", url);
+
+        item = resolveItemByUrl(context, url, notification);
+
+        return item;
+    }
+
+    private Item resolveItemByUrl(Context context, String url, Notification notification)
+        throws SQLException, HttpResponseException {
+        Item item = null;
+        if (LDNUtils.hasUUIDInURL(url)) {
+            UUID uuid = LDNUtils.getUUIDFromURL(url);
+
+            item = itemService.find(context, uuid);
+
+            if (Objects.isNull(item)) {
+                throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                    format("Item with uuid %s not found", uuid));
+            }
+            return item;
+        }
+        String handle = handleService.resolveUrlToHandle(context, url);
+
+        if (Objects.isNull(handle)) {
+            throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                format("Handle not found for %s", url));
+        }
+
+        DSpaceObject object = handleService.resolveToObject(context, handle);
+
+        if (Objects.isNull(object)) {
+            throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                format("Item with handle %s not found", handle));
+        }
+
+        if (object.getType() == Constants.ITEM) {
+            item = (Item) object;
+        } else {
+            throw new HttpResponseException(HttpStatus.SC_UNPROCESSABLE_ENTITY,
+                format("Handle %s does not resolve to an item", handle));
+        }
+        return item;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNProcessor.java

@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.processor;
+
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.core.Context;
+
+/**
+ * Processor interface to allow for custom implementations of process.
+ */
+public interface LDNProcessor {
+
+    /**
+     * Process received notification.
+     *
+     * @param notification received notification
+     * @throws Exception something went wrong processing the notification
+     */
+    public void process(Context context, Notification notification) throws Exception;
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/LDNMessageService.java

@@ -0,0 +1,176 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.ldn.model.Service;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link LDNMessageEntity} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public interface LDNMessageService {
+
+    /**
+     * find the ldn message by id
+     *
+     * @param context the context
+     * @param id the uri
+     * @return the ldn message by id
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity find(Context context, String id) throws SQLException;
+
+    /**
+     * find all ldn messages
+     *
+     * @param context the context
+     * @return all ldn messages by id
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findAll(Context context) throws SQLException;
+
+    /**
+     * Creates a new LDNMessage
+     *
+     * @param context The DSpace context
+     * @param id the uri
+     * @return the created LDN Message
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity create(Context context, String id) throws SQLException;
+
+    /**
+     * Creates a new LDNMessage
+     *
+     * @param context The DSpace context
+     * @param notification the requested notification
+     * @param sourceIp the source ip
+     * @return the created LDN Message
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity create(Context context, Notification notification, String sourceIp) throws SQLException;
+
+    /**
+     * Update the provided LDNMessage
+     *
+     * @param context The DSpace context
+     * @param ldnMessage the LDNMessage
+     * @throws SQLException If something goes wrong in the database
+     */
+    public void update(Context context, LDNMessageEntity ldnMessage) throws SQLException;
+
+    /**
+     * Find the oldest queued LDNMessages that still can be elaborated
+     *
+     * @return list of LDN messages
+     * @param context The DSpace context
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findOldestMessagesToProcess(Context context) throws SQLException;
+
+    /**
+     * Find all messages in the queue with the Processing status but timed-out
+     * 
+     * @return all the LDN Messages to be fixed on their queue_ attributes
+     * @param context The DSpace context
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context) throws SQLException;
+
+    /**
+     * Find all messages in the queue with the Processing status but timed-out and modify their queue_status
+     * considering the queue_attempts
+     * 
+     * @return number of messages fixed
+     * @param context The DSpace context
+     * @throws SQLException
+     */
+    public int checkQueueMessageTimeout(Context context) throws SQLException;
+
+    /**
+     * Elaborates the oldest enqueued message
+     * 
+     * @return number of messages fixed
+     * @param context The DSpace context
+     */
+    public int extractAndProcessMessageFromQueue(Context context) throws SQLException;
+
+    /**
+     * find the related notify service entity
+     *
+     * @param context the context
+     * @param service the service
+     * @return the NotifyServiceEntity
+     * @throws SQLException if something goes wrong
+     */
+    public NotifyServiceEntity findNotifyService(Context context, Service service) throws SQLException;
+
+    /**
+     * find the ldn messages of Requests by item uuid
+     *
+     * @param context the context
+     * @param item the item
+     * @return the item requests object
+     * @throws SQLException If something goes wrong in the database
+     */
+    public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws SQLException;
+
+    /**
+     * find the UUID of a previous tentativeReject notification associated with a new resubmission (Endorsement or
+     * Review patterns only)
+     *
+     * @param context the context
+     * @param item the previousVersion item associated with a potential resubmission
+     * @return the UUID of a previous tentativeReject notification associated with a potential resubmission if found
+     */
+    public String findEndorsementOrReviewResubmissionIdByItem(Context context, Item item, NotifyServiceEntity service)
+            throws SQLException;
+
+    /**
+     * delete the provided ldn message
+     *
+     * @param context the context
+     * @param ldnMessage the ldn message
+     * @throws SQLException if something goes wrong
+     */
+    public void delete(Context context, LDNMessageEntity ldnMessage) throws SQLException;
+
+    /**
+     * find the ldn messages to be reprocessed
+     *
+     * @param context the context
+     * @throws SQLException if something goes wrong
+     */
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException;
+
+    /**
+     * check if IP number is included in the configured ip-range on the Notify
+     * Service
+     * 
+     * @param origin   the Notify Service entity
+     * @param sourceIp the ip to evaluate
+     */
+    public boolean isValidIp(NotifyServiceEntity origin, String sourceIp);
+
+    /**
+     * check if the notification is targeting the current system
+     * 
+     * @param notification   the LDN Message entity
+     */
+    boolean isTargetCurrent(Notification notification);
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyPatternToTriggerService.java

@@ -0,0 +1,84 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyPatternToTrigger} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyPatternToTriggerService {
+
+    /**
+     * find all notify patterns to be triggered
+     *
+     * @param context the context
+     * @return all notify patterns to be trigger
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findAll(Context context) throws SQLException;
+
+    /**
+     * find list of Notify Patterns To be Triggered by item
+     *
+     * @param context the context
+     * @param item the item of NotifyPatternToTrigger
+     * @return the matched NotifyPatternToTrigger list by item
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item)
+        throws SQLException;
+
+    /**
+     * find list of Notify Patterns To be Triggered by item and pattern
+     *
+     * @param context the context
+     * @param item the item of NotifyPatternToTrigger
+     * @param pattern the pattern of NotifyPatternToTrigger
+     *
+     * @return the matched NotifyPatternToTrigger list by item and pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException;
+
+    /**
+     * create new notifyPatternToTrigger
+     *
+     * @param context the context
+     * @return the created NotifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public NotifyPatternToTrigger create(Context context) throws SQLException;
+
+    /**
+     * update the provided notifyPatternToTrigger
+     *
+     * @param context the context
+     * @param notifyPatternToTrigger the notifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException;
+
+    /**
+     * delete the provided notifyPatternToTrigger
+     *
+     * @param context the context
+     * @param notifyPatternToTrigger the notifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException;
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyService.java

@@ -0,0 +1,92 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyServiceEntity} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyService {
+
+    /**
+     * find all notify service entities
+     *
+     * @param context the context
+     * @return all notify service entities
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findAll(Context context) throws SQLException;
+
+    /**
+     * find one NotifyServiceEntity by id
+     *
+     * @param context the context
+     * @param id the id of NotifyServiceEntity
+     * @return the matched NotifyServiceEntity by id
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity find(Context context, Integer id) throws SQLException;
+
+    /**
+     * create new notifyServiceEntity
+     *
+     * @param context the context
+     * @param name name of the service
+     * @return the created NotifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity create(Context context, String name) throws SQLException;
+
+    /**
+     * update the provided notifyServiceEntity
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException;
+
+    /**
+     * delete the provided notifyServiceEntity
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException;
+
+    /**
+     * find the NotifyServiceEntity matched with the provided ldnUrl
+     *
+     * @param context the context
+     * @param ldnUrl the ldnUrl
+     * @return the NotifyServiceEntity matched the provided ldnUrl
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException;
+
+    /**
+     * find all NotifyServiceEntity matched the provided inbound pattern
+     * from its related notifyServiceInboundPatterns
+     * also with 'automatic' equals to false
+     *
+     * @param context the context
+     * @param pattern the ldnUrl
+     * @return all NotifyServiceEntity matched the provided pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException;
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyServiceInboundPatternService.java

@@ -0,0 +1,76 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyServiceInboundPattern} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceInboundPatternService {
+
+    /**
+     * find all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @param pattern the pattern
+     * @return all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException;
+
+    /**
+     * find all automatic notifyServiceInboundPatterns
+     *
+     * @param context the context
+     * @return all automatic notifyServiceInboundPatterns
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException;
+
+    /**
+     * create new notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @return the created notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern create(Context context, NotifyServiceEntity notifyServiceEntity)
+        throws SQLException;
+
+    /**
+     * update the provided notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param inboundPattern the notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException;
+
+    /**
+     * delete the provided notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param inboundPattern the notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException;
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java

@@ -0,0 +1,441 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service.impl;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonSyntaxException;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.LDNRouter;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.dao.LDNMessageDao;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.ldn.model.NotifyRequestStatusEnum;
+import org.dspace.app.ldn.model.RequestStatus;
+import org.dspace.app.ldn.model.Service;
+import org.dspace.app.ldn.processor.LDNProcessor;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.utility.LDNUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.discovery.indexobject.IndexableLDNNotification;
+import org.dspace.event.Event;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation of {@link LDNMessageService}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public class LDNMessageServiceImpl implements LDNMessageService {
+
+    @Autowired(required = true)
+    private LDNMessageDao ldnMessageDao;
+    @Autowired(required = true)
+    private NotifyServiceDao notifyServiceDao;
+    @Autowired(required = true)
+    private ConfigurationService configurationService;
+    @Autowired(required = true)
+    private HandleService handleService;
+    @Autowired(required = true)
+    private ItemService itemService;
+    @Autowired(required = true)
+    private LDNRouter ldnRouter;
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNMessageServiceImpl.class);
+    private static final String LDN_ID_PREFIX = "urn:uuid:";
+
+    protected LDNMessageServiceImpl() {
+
+    }
+
+    @Override
+    public LDNMessageEntity find(Context context, String id) throws SQLException {
+
+        if (id == null) {
+            return null;
+        }
+
+        id = id.startsWith(LDN_ID_PREFIX) ? id : LDN_ID_PREFIX + id;
+        return ldnMessageDao.findByID(context, LDNMessageEntity.class, id);
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAll(Context context) throws SQLException {
+        return ldnMessageDao.findAll(context, LDNMessageEntity.class);
+    }
+
+    @Override
+    public LDNMessageEntity create(Context context, String id) throws SQLException {
+        LDNMessageEntity result = ldnMessageDao.findByID(context, LDNMessageEntity.class, id);
+        if (result != null) {
+            throw new SQLException("Duplicate LDN Message ID [" + id + "] detected. This message is rejected.");
+        }
+        return ldnMessageDao.create(context, new LDNMessageEntity(id));
+    }
+
+    @Override
+    public LDNMessageEntity create(Context context, Notification notification, String sourceIp) throws SQLException {
+        LDNMessageEntity ldnMessage = create(context, notification.getId());
+        DSpaceObject obj = findDspaceObjectByUrl(context, notification.getObject().getId());
+        if (obj == null) {
+            if (isTargetCurrent(notification)) {
+                // this means we're sending the notification
+                obj = findDspaceObjectByUrl(context, notification.getObject().getAsObject());
+                // use as:object for sender
+            } else {
+                // this means we're receiving the notification
+                obj = findDspaceObjectByUrl(context, notification.getObject().getAsSubject());
+                // use as:subject for receiver
+            }
+        }
+        ldnMessage.setObject(obj);
+        if (null != notification.getContext()) {
+            ldnMessage.setContext(findDspaceObjectByUrl(context, notification.getContext().getId()));
+        }
+        ldnMessage.setOrigin(findNotifyService(context, notification.getOrigin()));
+        ldnMessage.setInReplyTo(find(context, notification.getInReplyTo()));
+        ObjectMapper mapper = new ObjectMapper();
+        String message = null;
+        try {
+            message = mapper.writeValueAsString(notification);
+            ldnMessage.setMessage(message);
+        } catch (JsonProcessingException e) {
+            log.error("Notification json can't be correctly processed " +
+                "and stored inside the LDN Message Entity" + ldnMessage);
+            log.error(e);
+        }
+        ldnMessage.setType(StringUtils.joinWith(",", notification.getType()));
+        Set<String> notificationType = notification.getType();
+        if (notificationType == null) {
+            log.error("Notification has no notificationType attribute! " + notification);
+            return null;
+        }
+        ArrayList<String> notificationTypeArrayList = new ArrayList<String>(notificationType);
+        // sorting the list
+        Collections.sort(notificationTypeArrayList);
+        ldnMessage.setActivityStreamType(notificationTypeArrayList.get(0));
+        if (notificationTypeArrayList.size() > 1) {
+            ldnMessage.setCoarNotifyType(notificationTypeArrayList.get(1));
+        } else {
+            // The Notification's Type array does not include the CoarNotifyType information, e.g. ack notifications
+            // Attempt to find it via the inReplyTo if present
+            if (ldnMessage.getInReplyTo() != null) {
+                ldnMessage.setCoarNotifyType(ldnMessage.getInReplyTo().getCoarNotifyType());
+            }
+        }
+        ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        ldnMessage.setSourceIp(sourceIp);
+        if (ldnMessage.getOrigin() == null && !"Offer".equalsIgnoreCase(ldnMessage.getActivityStreamType())) {
+            ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNTRUSTED);
+        } else {
+
+            boolean ipCheckRangeEnabled = configurationService.getBooleanProperty("ldn.ip-range.enabled", true);
+            if (ipCheckRangeEnabled && !isValidIp(ldnMessage.getOrigin(), sourceIp)) {
+                ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNTRUSTED_IP);
+            }
+        }
+        ldnMessage.setQueueTimeout(new Date());
+
+        update(context, ldnMessage);
+        return ldnMessage;
+    }
+
+    @Override
+    public boolean isValidIp(NotifyServiceEntity origin, String sourceIp) {
+
+        String lowerIp = origin.getLowerIp();
+        String upperIp = origin.getUpperIp();
+
+        try {
+            InetAddress ip = InetAddress.getByName(sourceIp);
+            InetAddress lowerBoundAddress = InetAddress.getByName(lowerIp);
+            InetAddress upperBoundAddress = InetAddress.getByName(upperIp);
+
+            long ipLong = ipToLong(ip);
+            long lowerBoundLong = ipToLong(lowerBoundAddress);
+            long upperBoundLong = ipToLong(upperBoundAddress);
+
+            return ipLong >= lowerBoundLong && ipLong <= upperBoundLong;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
+
+    private long ipToLong(InetAddress ip) {
+        byte[] octets = ip.getAddress();
+        long result = 0;
+        for (byte octet : octets) {
+            result <<= 8;
+            result |= octet & 0xff;
+        }
+        return result;
+    }
+
+    @Override
+    public void update(Context context, LDNMessageEntity ldnMessage) throws SQLException {
+        // move the queue_status from UNTRUSTED to QUEUED if origin is a known NotifyService
+        if (ldnMessage.getOrigin() != null &&
+            LDNMessageEntity.QUEUE_STATUS_UNTRUSTED.compareTo(ldnMessage.getQueueStatus()) == 0) {
+            ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        }
+        ldnMessageDao.save(context, ldnMessage);
+        UUID notificationUUID = UUID.fromString(ldnMessage.getID().replace(LDN_ID_PREFIX, ""));
+        ArrayList<String> identifiersList = new ArrayList<String>();
+        identifiersList.add(ldnMessage.getID());
+        context.addEvent(
+            new Event(Event.MODIFY, Constants.LDN_MESSAGE,
+                notificationUUID,
+                IndexableLDNNotification.TYPE, identifiersList));
+    }
+
+    private DSpaceObject findDspaceObjectByUrl(Context context, String url) throws SQLException {
+        String dspaceUrl = configurationService.getProperty("dspace.ui.url") + "/handle/";
+
+        if (StringUtils.startsWith(url, dspaceUrl)) {
+            return handleService.resolveToObject(context, url.substring(dspaceUrl.length()));
+        }
+
+        String handleResolver = configurationService.getProperty("handle.canonical.prefix", "https://hdl.handle.net/");
+        if (StringUtils.startsWith(url, handleResolver)) {
+            return handleService.resolveToObject(context, url.substring(handleResolver.length()));
+        }
+
+        dspaceUrl = configurationService.getProperty("dspace.ui.url") + "/items/";
+        if (StringUtils.startsWith(url, dspaceUrl)) {
+            return itemService.find(context, UUID.fromString(url.substring(dspaceUrl.length())));
+        }
+
+        return null;
+    }
+
+    public NotifyServiceEntity findNotifyService(Context context, Service service) throws SQLException {
+        return notifyServiceDao.findByLdnUrl(context, service.getInbox());
+    }
+
+    @Override
+    public List<LDNMessageEntity> findOldestMessagesToProcess(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        int max_attempts = configurationService.getIntProperty("ldn.processor.max.attempts");
+        result = ldnMessageDao.findOldestMessageToProcess(context, max_attempts);
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        result = ldnMessageDao.findMessagesToBeReprocessed(context);
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        int max_attempts = configurationService.getIntProperty("ldn.processor.max.attempts");
+        result = ldnMessageDao.findProcessingTimedoutMessages(context, max_attempts);
+        return result;
+    }
+
+    @Override
+    public int extractAndProcessMessageFromQueue(Context context) throws SQLException {
+        int count = 0;
+        int timeoutInMinutes = configurationService.getIntProperty("ldn.processor.queue.msg.timeout", 60);
+
+        List<LDNMessageEntity> messages = findOldestMessagesToProcess(context);
+        messages.addAll(findMessagesToBeReprocessed(context));
+
+        Optional<LDNMessageEntity> msgOpt = getSingleMessageEntity(messages);
+
+        while (msgOpt.isPresent()) {
+            LDNProcessor processor = null;
+            LDNMessageEntity msg = msgOpt.get();
+            processor = ldnRouter.route(msg);
+            try {
+                boolean isServiceDisabled = !isServiceEnabled(msg);
+                if (processor == null || isServiceDisabled) {
+                    log.warn("No processor found for LDN message " + msg);
+                    Integer status = isServiceDisabled ? LDNMessageEntity.QUEUE_STATUS_UNTRUSTED
+                        : LDNMessageEntity.QUEUE_STATUS_UNMAPPED_ACTION;
+                    msg.setQueueStatus(status);
+                    msg.setQueueAttempts(msg.getQueueAttempts() + 1);
+                    update(context, msg);
+                } else {
+                    msg.setQueueLastStartTime(new Date());
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_PROCESSING);
+                    msg.setQueueTimeout(DateUtils.addMinutes(new Date(), timeoutInMinutes));
+                    update(context, msg);
+                    ObjectMapper mapper = new ObjectMapper();
+                    Notification notification = mapper.readValue(msg.getMessage(), Notification.class);
+                    processor.process(context, notification);
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_PROCESSED);
+                    count++;
+                }
+            } catch (JsonSyntaxException jse) {
+                log.error("Unable to read JSON notification from LdnMessage " + msg, jse);
+                msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+            } catch (Exception e) {
+                log.error(e);
+                msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+            } finally {
+                msg.setQueueAttempts(msg.getQueueAttempts() + 1);
+                update(context, msg);
+            }
+
+            messages = findOldestMessagesToProcess(context);
+            messages.addAll(findMessagesToBeReprocessed(context));
+            msgOpt = getSingleMessageEntity(messages);
+        }
+        return count;
+    }
+
+    private boolean isServiceEnabled(LDNMessageEntity msg) {
+        String localInboxUrl = configurationService.getProperty("ldn.notify.inbox");
+        if (msg.getTarget() == null || StringUtils.equals(msg.getTarget().getLdnUrl(), localInboxUrl)) {
+            return msg.getOrigin().isEnabled();
+        }
+        return msg.getTarget().isEnabled();
+    }
+
+    @Override
+    public int checkQueueMessageTimeout(Context context) throws SQLException {
+        int count = 0;
+        int maxAttempts = configurationService.getIntProperty("ldn.processor.max.attempts", 5);
+        /*
+         * put failed on processing messages with timed-out timeout and
+         * attempts >= configured_max_attempts put queue on processing messages with
+         * timed-out timeout and attempts < configured_max_attempts
+         */
+        Optional<LDNMessageEntity> msgOpt = getSingleMessageEntity(findProcessingTimedoutMessages(context));
+
+        while (msgOpt.isPresent()) {
+            LDNMessageEntity msg = msgOpt.get();
+            try {
+                if (msg.getQueueAttempts() >= maxAttempts) {
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+                } else {
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+                }
+                update(context, msg);
+                count++;
+            } catch (SQLException e) {
+                log.error("Can't update LDN message " + msg, e);
+            }
+            msgOpt = getSingleMessageEntity(findProcessingTimedoutMessages(context));
+        }
+        return count;
+    }
+
+    public Optional<LDNMessageEntity> getSingleMessageEntity(Collection<LDNMessageEntity> messages) {
+        return messages.stream().findFirst();
+    }
+
+    @Override
+    public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws SQLException {
+        NotifyRequestStatus result = new NotifyRequestStatus();
+        result.setItemUuid(item.getID());
+        List<LDNMessageEntity> msgs = ldnMessageDao.findAllMessagesByItem(
+            context, item, "Offer");
+        if (msgs != null && !msgs.isEmpty()) {
+            for (LDNMessageEntity msg : msgs) {
+                RequestStatus offer = new RequestStatus();
+                NotifyServiceEntity nse = msg.getOrigin();
+                if (nse == null) {
+                    nse = msg.getTarget();
+                }
+                offer.setServiceName(nse == null ? "Unknown Service" : nse.getName());
+                offer.setServiceUrl(nse == null ? "" : nse.getUrl());
+                offer.setOfferType(LDNUtils.getNotifyType(msg.getCoarNotifyType()));
+                List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem(
+                    context, msg, item, "Accept", "Reject", "TentativeReject", "TentativeAccept",
+                        "Announce");
+                if (acks == null || acks.isEmpty()) {
+                    offer.setStatus(NotifyRequestStatusEnum.REQUESTED);
+                } else if (acks.stream()
+                        .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeReject")))
+                        .findAny().isPresent()) {
+                    offer.setStatus(NotifyRequestStatusEnum.TENTATIVE_REJECT);
+                } else if (acks.stream()
+                        .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("Reject")))
+                        .findAny().isPresent()) {
+                    offer.setStatus(NotifyRequestStatusEnum.REJECTED);
+                } else if (acks.stream()
+                    .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeAccept") ||
+                        c.getActivityStreamType().equalsIgnoreCase("Accept")))
+                    .findAny().isPresent()) {
+                    offer.setStatus(NotifyRequestStatusEnum.ACCEPTED);
+                }
+                if (acks.stream().filter(
+                    c -> c.getActivityStreamType().equalsIgnoreCase("Announce"))
+                    .findAny().isEmpty()) {
+                    result.addRequestStatus(offer);
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public String findEndorsementOrReviewResubmissionIdByItem(Context context, Item item, NotifyServiceEntity service)
+            throws SQLException {
+        List<LDNMessageEntity> msgs = ldnMessageDao.findAllMessagesByItem(
+                context, item, "TentativeReject");
+
+        if (msgs != null && !msgs.isEmpty()) {
+            for (LDNMessageEntity msg : msgs) {
+                // Review and Endorsement are the only patterns supporting resubmissions at present
+                if (msg.getCoarNotifyType().contains("EndorsementAction")
+                        || msg.getCoarNotifyType().contains("ReviewAction")) {
+                    // Only provide the resubmissionReplyTo UUID if the pattern supports resubmission
+                    // Add an extra check to ensure that this is a resubmission: current notification service
+                    // matches the service associated with a previous tentativeReject response. This is to avoid a
+                    // case where a previous version of the item received a tentativeReject from one service
+                    // and the author decides to submit the version to a different service, instead of a resubmission
+                    if (msg.getOrigin() != null && msg.getOrigin().getID().equals(service.getID())) {
+                        // Return the first ID found that will be used in the inReplyTo for a resubmission notification
+                        return msg.getID();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public void delete(Context context, LDNMessageEntity ldnMessage) throws SQLException {
+        ldnMessageDao.delete(context, ldnMessage);
+    }
+
+    @Override
+    public boolean isTargetCurrent(Notification notification) {
+        String localInboxUrl = configurationService.getProperty("ldn.notify.inbox");
+        return StringUtils.equals(notification.getTarget().getInbox(), localInboxUrl);
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyPatternToTriggerImpl.java

@@ -0,0 +1,62 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.dao.NotifyPatternToTriggerDao;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link NotifyPatternToTriggerService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyPatternToTriggerImpl implements NotifyPatternToTriggerService {
+
+    @Autowired(required = true)
+    private NotifyPatternToTriggerDao notifyPatternToTriggerDao;
+
+    @Override
+    public List<NotifyPatternToTrigger> findAll(Context context) throws SQLException {
+        return notifyPatternToTriggerDao.findAll(context, NotifyPatternToTrigger.class);
+    }
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item) throws SQLException {
+        return notifyPatternToTriggerDao.findByItem(context, item);
+    }
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException {
+        return notifyPatternToTriggerDao.findByItemAndPattern(context, item, pattern);
+    }
+
+    @Override
+    public NotifyPatternToTrigger create(Context context) throws SQLException {
+        NotifyPatternToTrigger notifyPatternToTrigger = new NotifyPatternToTrigger();
+        return notifyPatternToTriggerDao.create(context, notifyPatternToTrigger);
+    }
+
+    @Override
+    public void update(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException {
+        notifyPatternToTriggerDao.save(context, notifyPatternToTrigger);
+    }
+
+    @Override
+    public void delete(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException {
+        notifyPatternToTriggerDao.delete(context, notifyPatternToTrigger);
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceImpl.java

@@ -0,0 +1,67 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link NotifyService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceImpl implements NotifyService {
+
+    @Autowired(required = true)
+    private NotifyServiceDao notifyServiceDao;
+
+    @Override
+    public List<NotifyServiceEntity> findAll(Context context) throws SQLException {
+        return notifyServiceDao.findAll(context, NotifyServiceEntity.class);
+    }
+
+    @Override
+    public NotifyServiceEntity find(Context context, Integer id) throws SQLException {
+        return notifyServiceDao.findByID(context, NotifyServiceEntity.class, id);
+    }
+
+    @Override
+    public NotifyServiceEntity create(Context context, String name) throws SQLException {
+        NotifyServiceEntity notifyServiceEntity = new NotifyServiceEntity();
+        notifyServiceEntity.setName(name);
+        return notifyServiceDao.create(context, notifyServiceEntity);
+    }
+
+    @Override
+    public void update(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException {
+        notifyServiceDao.save(context, notifyServiceEntity);
+    }
+
+    @Override
+    public void delete(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException {
+        notifyServiceDao.delete(context, notifyServiceEntity);
+    }
+
+    @Override
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException {
+        return notifyServiceDao.findByLdnUrl(context, ldnUrl);
+    }
+
+    @Override
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException {
+        return notifyServiceDao.findManualServicesByInboundPattern(context, pattern);
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceInboundPatternServiceImpl.java

@@ -0,0 +1,59 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.dao.NotifyServiceInboundPatternDao;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation Service class for the {@link NotifyServiceInboundPatternService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceInboundPatternServiceImpl implements NotifyServiceInboundPatternService {
+
+    @Autowired
+    private NotifyServiceInboundPatternDao inboundPatternDao;
+
+    @Override
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException {
+        return inboundPatternDao.findByServiceAndPattern(context, notifyServiceEntity, pattern);
+    }
+
+    @Override
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException {
+        return inboundPatternDao.findAutomaticPatterns(context);
+    }
+
+    @Override
+    public NotifyServiceInboundPattern create(Context context, NotifyServiceEntity notifyServiceEntity)
+        throws SQLException {
+        NotifyServiceInboundPattern inboundPattern = new NotifyServiceInboundPattern();
+        inboundPattern.setNotifyService(notifyServiceEntity);
+        return inboundPatternDao.create(context, inboundPattern);
+    }
+
+    @Override
+    public void update(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException {
+        inboundPatternDao.save(context, inboundPattern);
+    }
+
+    @Override
+    public void delete(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException {
+        inboundPatternDao.delete(context, inboundPattern);
+    }
+}

dspace-api/src/main/java/org/dspace/app/ldn/utility/LDNUtils.java

@@ -0,0 +1,96 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.ldn.utility;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Some linked data notification utilities.
+ */
+public class LDNUtils {
+
+    private final static Pattern UUID_REGEX_PATTERN = Pattern.compile(
+            "\\p{XDigit}{8}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{12}");
+
+    private final static String SIMPLE_PROTOCOL_REGEX = "^(http[s]?://www\\.|http[s]?://|www\\.)";
+
+    /**
+     * 
+     */
+    private LDNUtils() {
+
+    }
+
+    /**
+     * Whether the URL contains an UUID. Used to determine item id from item URL.
+     *
+     * @param url item URL
+     * @return boolean true if URL has UUID, false otherwise
+     */
+    public static boolean hasUUIDInURL(String url) {
+        Matcher matcher = UUID_REGEX_PATTERN.matcher(url);
+
+        return matcher.find();
+    }
+
+    /**
+     * Extract UUID from URL.
+     *
+     * @param url item URL
+     * @return UUID item id
+     */
+    public static UUID getUUIDFromURL(String url) {
+        Matcher matcher = UUID_REGEX_PATTERN.matcher(url);
+        StringBuilder handle = new StringBuilder();
+        if (matcher.find()) {
+            handle.append(matcher.group(0));
+        }
+        return UUID.fromString(handle.toString());
+    }
+
+    /**
+     * Remove http or https protocol from URL.
+     *
+     * @param url URL
+     * @return String URL without protocol
+     */
+    public static String removedProtocol(String url) {
+        return url.replaceFirst(SIMPLE_PROTOCOL_REGEX, EMPTY);
+    }
+
+    /**
+     * Custom context resolver processing. Currently converting DOI URL to DOI id.
+     *
+     * @param value context ietf:cite-as
+     * @return String ietf:cite-as identifier
+     */
+    public static String processContextResolverId(String value) {
+        String resolverId = value;
+        resolverId = resolverId.replace("https://doi.org/", "doi:");
+
+        return resolverId;
+    }
+
+    /**
+     * Clear the coarNotifyType from the source code.
+     *
+     * @param coarNotifyType coar Notify Type to sanitize
+     * @return String just the notify type
+     */
+    public static String getNotifyType(String coarNotifyType) {
+        String justNotifyType = coarNotifyType;
+        justNotifyType = justNotifyType.substring(justNotifyType.lastIndexOf(":") + 1);
+        justNotifyType = justNotifyType.replace("Action",  "");
+        return justNotifyType;
+    }
+
+}

dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java

@@ -7,9 +7,7 @@
  */
 package org.dspace.app.mediafilter;
 
-import java.awt.image.BufferedImage;
 import java.io.InputStream;
-import javax.imageio.ImageIO;
 
 import org.dspace.content.Item;
 import org.dspace.services.ConfigurationService;
@@ -63,27 +61,20 @@ public class BrandedPreviewJPEGFilter extends MediaFilter {
     @Override
     public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
         throws Exception {
-        // read in bitstream's image
-        BufferedImage buf = ImageIO.read(source);
-
         // get config params
         ConfigurationService configurationService
                 = DSpaceServicesFactory.getInstance().getConfigurationService();
-        float xmax = (float) configurationService
-            .getIntProperty("webui.preview.maxwidth");
-        float ymax = (float) configurationService
-            .getIntProperty("webui.preview.maxheight");
-        boolean blurring = (boolean) configurationService
-            .getBooleanProperty("webui.preview.blurring");
-        boolean hqscaling = (boolean) configurationService
-            .getBooleanProperty("webui.preview.hqscaling");
+        int xmax = configurationService.getIntProperty("webui.preview.maxwidth");
+        int ymax = configurationService.getIntProperty("webui.preview.maxheight");
+        boolean blurring = configurationService.getBooleanProperty("webui.preview.blurring");
+        boolean hqscaling = configurationService.getBooleanProperty("webui.preview.hqscaling");
         int brandHeight = configurationService.getIntProperty("webui.preview.brand.height");
         String brandFont = configurationService.getProperty("webui.preview.brand.font");
         int brandFontPoint = configurationService.getIntProperty("webui.preview.brand.fontpoint");
 
         JPEGFilter jpegFilter = new JPEGFilter();
-        return jpegFilter
-            .getThumbDim(currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint,
-                         brandFont);
+        return jpegFilter.getThumb(
+                currentItem, source, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint, brandFont
+        );
     }
 }

dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java

@@ -8,19 +8,32 @@
 package org.dspace.app.mediafilter;
 
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Transparency;
+import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.ConvolveOp;
 import java.awt.image.Kernel;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import javax.imageio.ImageIO;
 
+import com.drew.imaging.ImageMetadataReader;
+import com.drew.imaging.ImageProcessingException;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifIFD0Directory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
@@ -33,6 +46,8 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  * @author Jason Sherman jsherman@usao.edu
  */
 public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats {
+    private static final Logger log = LogManager.getLogger(JPEGFilter.class);
+
     @Override
     public String getFilteredName(String oldFilename) {
         return oldFilename + ".jpg";
@@ -62,6 +77,115 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
         return "Generated Thumbnail";
     }
 
+    /**
+     * Gets the rotation angle from image's metadata using ImageReader.
+     * This method consumes the InputStream, so you need to be careful to don't reuse the same InputStream after
+     * computing the rotation angle.
+     *
+     * @param buf InputStream of the image file
+     * @return Rotation angle in degrees (0, 90, 180, or 270)
+     */
+    public static int getImageRotationUsingImageReader(InputStream buf) {
+        try {
+            Metadata metadata = ImageMetadataReader.readMetadata(buf);
+            ExifIFD0Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
+            if (directory != null && directory.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) {
+                return convertRotationToDegrees(directory.getInt(ExifIFD0Directory.TAG_ORIENTATION));
+            }
+        } catch (MetadataException | ImageProcessingException | IOException e) {
+            log.error("Error reading image metadata", e);
+        }
+        return 0;
+    }
+
+    public static int convertRotationToDegrees(int valueNode) {
+        // Common orientation values:
+        // 1 = Normal (0°)
+        // 6 = Rotated 90° CW
+        // 3 = Rotated 180°
+        // 8 = Rotated 270° CW
+        switch (valueNode) {
+            case 6:
+                return 90;
+            case 3:
+                return 180;
+            case 8:
+                return 270;
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * Rotates an image by the specified angle
+     *
+     * @param image The original image
+     * @param angle The rotation angle in degrees
+     * @return Rotated image
+     */
+    public static BufferedImage rotateImage(BufferedImage image, int angle) {
+        if (angle == 0) {
+            return image;
+        }
+
+        double radians = Math.toRadians(angle);
+        double sin = Math.abs(Math.sin(radians));
+        double cos = Math.abs(Math.cos(radians));
+
+        int newWidth = (int) Math.round(image.getWidth() * cos + image.getHeight() * sin);
+        int newHeight = (int) Math.round(image.getWidth() * sin + image.getHeight() * cos);
+
+        BufferedImage rotated = new BufferedImage(newWidth, newHeight, image.getType());
+        Graphics2D g2d = rotated.createGraphics();
+        AffineTransform at = new AffineTransform();
+
+        at.translate(newWidth / 2, newHeight / 2);
+        at.rotate(radians);
+        at.translate(-image.getWidth() / 2, -image.getHeight() / 2);
+
+        g2d.setTransform(at);
+        g2d.drawImage(image, 0, 0, null);
+        g2d.dispose();
+
+        return rotated;
+    }
+
+    /**
+     * Calculates scaled dimension while maintaining aspect ratio
+     *
+     * @param imgSize  Original image dimensions
+     * @param boundary Maximum allowed dimensions
+     * @return New dimensions that fit within boundary while preserving aspect ratio
+     */
+    private Dimension getScaledDimension(Dimension imgSize, Dimension boundary) {
+
+        int originalWidth = imgSize.width;
+        int originalHeight = imgSize.height;
+        int boundWidth = boundary.width;
+        int boundHeight = boundary.height;
+        int newWidth = originalWidth;
+        int newHeight = originalHeight;
+
+
+        // First check if we need to scale width
+        if (originalWidth > boundWidth) {
+            // Scale width to fit
+            newWidth = boundWidth;
+            // Scale height to maintain aspect ratio
+            newHeight = (newWidth * originalHeight) / originalWidth;
+        }
+
+        // Then check if we need to scale even with the new height
+        if (newHeight > boundHeight) {
+            // Scale height to fit instead
+            newHeight = boundHeight;
+            newWidth = (newHeight * originalWidth) / originalHeight;
+        }
+
+        return new Dimension(newWidth, newHeight);
+    }
+
+
     /**
      * @param currentItem item
      * @param source      source input stream
@@ -72,10 +196,65 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
     @Override
     public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
         throws Exception {
-        // read in bitstream's image
-        BufferedImage buf = ImageIO.read(source);
+        return getThumb(currentItem, source, verbose);
+    }
 
-        return getThumb(currentItem, buf, verbose);
+    public InputStream getThumb(Item currentItem, InputStream source, boolean verbose)
+        throws Exception {
+        // get config params
+        final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+        int xmax = configurationService
+            .getIntProperty("thumbnail.maxwidth");
+        int ymax = configurationService
+            .getIntProperty("thumbnail.maxheight");
+        boolean blurring = (boolean) configurationService
+            .getBooleanProperty("thumbnail.blurring");
+        boolean hqscaling = (boolean) configurationService
+            .getBooleanProperty("thumbnail.hqscaling");
+
+        return getThumb(currentItem, source, verbose, xmax, ymax, blurring, hqscaling, 0, 0, null);
+    }
+
+    protected InputStream getThumb(
+        Item currentItem,
+        InputStream source,
+        boolean verbose,
+        int xmax,
+        int ymax,
+        boolean blurring,
+        boolean hqscaling,
+        int brandHeight,
+        int brandFontPoint,
+        String brandFont
+    ) throws Exception {
+
+        File tempFile = File.createTempFile("temp", ".tmp");
+        tempFile.deleteOnExit();
+
+        // Write to temp file
+        try (FileOutputStream fos = new FileOutputStream(tempFile)) {
+            byte[] buffer = new byte[4096];
+            int len;
+            while ((len = source.read(buffer)) != -1) {
+                fos.write(buffer, 0, len);
+            }
+        }
+
+        int rotation = 0;
+        try (FileInputStream fis = new FileInputStream(tempFile)) {
+            rotation = getImageRotationUsingImageReader(fis);
+        }
+
+        try (FileInputStream fis = new FileInputStream(tempFile)) {
+            // read in bitstream's image
+            BufferedImage buf = ImageIO.read(fis);
+
+            return getThumbDim(
+                currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint, rotation,
+                brandFont
+            );
+        }
     }
 
     public InputStream getThumb(Item currentItem, BufferedImage buf, boolean verbose)
@@ -83,25 +262,28 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
         // get config params
         final ConfigurationService configurationService
                 = DSpaceServicesFactory.getInstance().getConfigurationService();
-        float xmax = (float) configurationService
+        int xmax = configurationService
             .getIntProperty("thumbnail.maxwidth");
-        float ymax = (float) configurationService
+        int ymax = configurationService
             .getIntProperty("thumbnail.maxheight");
         boolean blurring = (boolean) configurationService
             .getBooleanProperty("thumbnail.blurring");
         boolean hqscaling = (boolean) configurationService
             .getBooleanProperty("thumbnail.hqscaling");
 
-        return getThumbDim(currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, 0, 0, null);
+        return getThumbDim(currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, 0, 0, 0, null);
     }
 
-    public InputStream getThumbDim(Item currentItem, BufferedImage buf, boolean verbose, float xmax, float ymax,
+    public InputStream getThumbDim(Item currentItem, BufferedImage buf, boolean verbose, int xmax, int ymax,
                                    boolean blurring, boolean hqscaling, int brandHeight, int brandFontPoint,
-                                   String brandFont)
+                                   int rotation, String brandFont)
         throws Exception {
-        // now get the image dimensions
-        float xsize = (float) buf.getWidth(null);
-        float ysize = (float) buf.getHeight(null);
+
+        // Rotate the image if needed
+        BufferedImage correctedImage = rotateImage(buf, rotation);
+
+        int xsize = correctedImage.getWidth();
+        int ysize = correctedImage.getHeight();
 
         // if verbose flag is set, print out dimensions
         // to STDOUT
@@ -109,86 +291,63 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
             System.out.println("original size: " + xsize + "," + ysize);
         }
 
-        // scale by x first if needed
-        if (xsize > xmax) {
-            // calculate scaling factor so that xsize * scale = new size (max)
-            float scale_factor = xmax / xsize;
+        // Calculate new dimensions while maintaining aspect ratio
+        Dimension newDimension = getScaledDimension(
+            new Dimension(xsize, ysize),
+            new Dimension(xmax, ymax)
+        );
 
-            // if verbose flag is set, print out extracted text
-            // to STDOUT
-            if (verbose) {
-                System.out.println("x scale factor: " + scale_factor);
-            }
-
-            // now reduce x size
-            // and y size
-            xsize = xsize * scale_factor;
-            ysize = ysize * scale_factor;
-
-            // if verbose flag is set, print out extracted text
-            // to STDOUT
-            if (verbose) {
-                System.out.println("size after fitting to maximum width: " + xsize + "," + ysize);
-            }
-        }
-
-        // scale by y if needed
-        if (ysize > ymax) {
-            float scale_factor = ymax / ysize;
-
-            // now reduce x size
-            // and y size
-            xsize = xsize * scale_factor;
-            ysize = ysize * scale_factor;
-        }
 
         // if verbose flag is set, print details to STDOUT
         if (verbose) {
-            System.out.println("size after fitting to maximum height: " + xsize + ", "
-                                   + ysize);
+            System.out.println("size after fitting to maximum height: " + newDimension.width + ", "
+                                   + newDimension.height);
         }
 
+        xsize = newDimension.width;
+        ysize = newDimension.height;
+
         // create an image buffer for the thumbnail with the new xsize, ysize
-        BufferedImage thumbnail = new BufferedImage((int) xsize, (int) ysize,
-                                                    BufferedImage.TYPE_INT_RGB);
+        BufferedImage thumbnail = new BufferedImage(xsize, ysize, BufferedImage.TYPE_INT_RGB);
 
         // Use blurring if selected in config.
         // a little blur before scaling does wonders for keeping moire in check.
         if (blurring) {
             // send the buffered image off to get blurred.
-            buf = getBlurredInstance((BufferedImage) buf);
+            correctedImage = getBlurredInstance(correctedImage);
         }
 
         // Use high quality scaling method if selected in config.
         // this has a definite performance penalty.
         if (hqscaling) {
             // send the buffered image off to get an HQ downscale.
-            buf = getScaledInstance((BufferedImage) buf, (int) xsize, (int) ysize,
-                                    (Object) RenderingHints.VALUE_INTERPOLATION_BICUBIC, (boolean) true);
+            correctedImage = getScaledInstance(correctedImage, xsize, ysize,
+                                               RenderingHints.VALUE_INTERPOLATION_BICUBIC, true);
         }
 
         // now render the image into the thumbnail buffer
         Graphics2D g2d = thumbnail.createGraphics();
-        g2d.drawImage(buf, 0, 0, (int) xsize, (int) ysize, null);
+        g2d.drawImage(correctedImage, 0, 0, xsize, ysize, null);
 
         if (brandHeight != 0) {
             ConfigurationService configurationService
                     = DSpaceServicesFactory.getInstance().getConfigurationService();
-            Brand brand = new Brand((int) xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
+            Brand brand = new Brand(xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
             BufferedImage brandImage = brand.create(configurationService.getProperty("webui.preview.brand"),
                                                     configurationService.getProperty("webui.preview.brand.abbrev"),
                                                     currentItem == null ? "" : "hdl:" + currentItem.getHandle());
 
-            g2d.drawImage(brandImage, (int) 0, (int) ysize, (int) xsize, (int) 20, null);
+            g2d.drawImage(brandImage, 0, ysize, xsize, 20, null);
         }
 
+
+        ByteArrayInputStream bais;
         // now create an input stream for the thumbnail buffer and return it
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
             ImageIO.write(thumbnail, "jpeg", baos);
-
             // now get the array
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            bais = new ByteArrayInputStream(baos.toByteArray());
+        }
 
         return bais; // hope this gets written out before its garbage collected!
     }

dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScript.java

@@ -7,6 +7,7 @@
  */
 package org.dspace.app.mediafilter;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,8 +38,9 @@ import org.dspace.utils.DSpace;
  * MFM: -v verbose outputs all extracted text to STDOUT; -f force forces all
  * bitstreams to be processed, even if they have been before; -n noindex does not
  * recreate index after processing bitstreams; -i [identifier] limits processing
- * scope to a community, collection or item; and -m [max] limits processing to a
- * maximum number of items.
+ * scope to a community, collection or item; -m [max] limits processing to a
+ * maximum number of items; -fd [fromdate] takes only items starting from this date,
+ * filtering by last_modified in the item table.
  */
 public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfiguration> {
 
@@ -60,6 +62,7 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
     private String[] filterNames;
     private String[] skipIds = null;
     private Map<String, List<String>> filterFormats = new HashMap<>();
+    private LocalDate fromDate = null;
 
     public MediaFilterScriptConfiguration getScriptConfiguration() {
         return new DSpace().getServiceManager()
@@ -112,6 +115,10 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
             skipIds = commandLine.getOptionValues('s');
         }
 
+        if (commandLine.hasOption('d')) {
+            fromDate = LocalDate.parse(commandLine.getOptionValue('d'));
+        }
+
 
     }
 
@@ -215,6 +222,10 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
             mediaFilterService.setSkipList(Arrays.asList(skipIds));
         }
 
+        if (fromDate != null) {
+            mediaFilterService.setFromDate(fromDate);
+        }
+
         Context c = null;
 
         try {

dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java

@@ -52,6 +52,8 @@ public class MediaFilterScriptConfiguration<T extends MediaFilterScript> extends
                                     .build();
         options.addOption(pluginOption);
 
+        options.addOption("d", "fromdate", true, "Process only item from specified last modified date");
+
         Option skipOption = Option.builder("s")
                                   .longOpt("skip")
                                   .hasArg()

dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java

@@ -9,8 +9,11 @@ package org.dspace.app.mediafilter;
 
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -93,6 +96,7 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
     protected boolean isVerbose = false;
     protected boolean isQuiet = false;
     protected boolean isForce = false; // default to not forced
+    protected LocalDate fromDate = null;
 
     protected MediaFilterServiceImpl() {
 
@@ -120,6 +124,15 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
             for (Community topLevelCommunity : topLevelCommunities) {
                 applyFiltersCommunity(context, topLevelCommunity);
             }
+        } else if (fromDate != null) {
+            Iterator<Item> itemIterator =
+                    itemService.findByLastModifiedSince(
+                            context,
+                            Date.from(fromDate.atStartOfDay(ZoneId.systemDefault()).toInstant())
+                    );
+            while (itemIterator.hasNext() && processed < max2Process) {
+                applyFiltersItem(context, itemIterator.next());
+            }
         } else {
             //otherwise, just find every item and process
             Iterator<Item> itemIterator = itemService.findAll(context);
@@ -588,4 +601,9 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
     public void setLogHandler(DSpaceRunnableHandler handler) {
         this.handler = handler;
     }
+
+    @Override
+    public void setFromDate(LocalDate fromDate) {
+        this.fromDate = fromDate;
+    }
 }

dspace-api/src/main/java/org/dspace/app/mediafilter/PDFBoxThumbnail.java

@@ -81,6 +81,7 @@ public class PDFBoxThumbnail extends MediaFilter {
 
         // Generate thumbnail derivative and return as IO stream.
         JPEGFilter jpegFilter = new JPEGFilter();
+
         return jpegFilter.getThumb(currentItem, buf, verbose);
     }
 }

dspace-api/src/main/java/org/dspace/app/mediafilter/service/MediaFilterService.java

@@ -8,6 +8,7 @@
 package org.dspace.app.mediafilter.service;
 
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +150,6 @@ public interface MediaFilterService {
      * @param handler
      */
     public void setLogHandler(DSpaceRunnableHandler handler);
+
+    public void setFromDate(LocalDate fromDate);
 }

dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java

@@ -8,19 +8,19 @@
 package org.dspace.app.requestitem;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Item;
 import org.dspace.core.Context;

dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java

@@ -11,11 +11,11 @@ package org.dspace.app.requestitem;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.ManagedBean;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.mail.MessagingException;
 
+import jakarta.annotation.ManagedBean;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.mail.MessagingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.requestitem.service.RequestItemService;

dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java

@@ -9,11 +9,11 @@ package org.dspace.app.requestitem.dao.impl;
 
 import java.sql.SQLException;
 import java.util.Iterator;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.app.requestitem.RequestItem;
 import org.dspace.app.requestitem.RequestItem_;
 import org.dspace.app.requestitem.dao.RequestItemDAO;
@@ -44,8 +44,12 @@ public class RequestItemDAOImpl extends AbstractHibernateDAO<RequestItem> implem
     }
     @Override
     public Iterator<RequestItem> findByItem(Context context, Item item) throws SQLException {
-        Query query = createQuery(context, "FROM RequestItem WHERE item_id= :uuid");
-        query.setParameter("uuid", item.getID());
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RequestItem.class);
+        Root<RequestItem> requestItemRoot = criteriaQuery.from(RequestItem.class);
+        criteriaQuery.select(requestItemRoot);
+        criteriaQuery.where(criteriaBuilder.equal(requestItemRoot.get(RequestItem_.item), item));
+        Query query = createQuery(context, criteriaQuery);
         return iterate(query);
     }
 }

dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java

@@ -12,8 +12,8 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -63,7 +63,7 @@ public class SHERPAService {
     @SuppressWarnings("unused")
     @PostConstruct
     private void init() {
-        // Get endoint and API key from configuration
+        // Get endpoint and API key from configuration
         endpoint = configurationService.getProperty("sherpa.romeo.url",
             "https://v2.sherpa.ac.uk/cgi/retrieve");
         apiKey = configurationService.getProperty("sherpa.romeo.apikey");
@@ -78,7 +78,7 @@ public class SHERPAService {
      * @param query ISSN string to pass in an "issn equals" API query
      * @return      SHERPAResponse containing an error or journal policies
      */
-    @Cacheable(key = "#query", cacheNames = "sherpa.searchByJournalISSN")
+    @Cacheable(key = "#query", condition = "#query != null", cacheNames = "sherpa.searchByJournalISSN")
     public SHERPAResponse searchByJournalISSN(String query) {
         return performRequest("publication", "issn", "equals", query, 0, 1);
     }

dspace-api/src/main/java/org/dspace/app/statistics/package.html

@@ -46,8 +46,6 @@ Several "stock" implementations are provided.
 	<dd>writes event records to the Java logger.</dd>
 	<dt>{@link org.dspace.statistics.SolrLoggerUsageEventListener SolrLoggerUsageEventListener}</dt>
 	<dd>writes event records to Solr.</dd>
-	<dt>{@link org.dspace.google.GoogleRecorderEventListener GoogleRecorderEventListener}<.dt>
-	<dd>writes event records to Google Analytics.</dd>
 </dl>
 </body>
 </html>

dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionProvider.java

@@ -0,0 +1,140 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.suggestion;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Suggestion provider that read the suggestion from the local suggestion solr
+ * core
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ *
+ */
+public abstract class SolrSuggestionProvider implements SuggestionProvider {
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrSuggestionProvider.class);
+
+    @Autowired
+    protected ItemService itemService;
+
+    @Autowired
+    protected SolrSuggestionStorageService solrSuggestionStorageService;
+
+    private String sourceName;
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    @Override
+    public long countAllTargets(Context context) {
+        try {
+            return this.solrSuggestionStorageService.countAllTargets(context, sourceName);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public long countUnprocessedSuggestionByTarget(Context context, UUID target) {
+        try {
+            return this.solrSuggestionStorageService.countUnprocessedSuggestionByTarget(context, sourceName, target);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<Suggestion> findAllUnprocessedSuggestions(Context context, UUID target, int pageSize, long offset,
+            boolean ascending) {
+
+        try {
+            return this.solrSuggestionStorageService.findAllUnprocessedSuggestions(context, sourceName,
+                target, pageSize, offset, ascending);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    @Override
+    public List<SuggestionTarget> findAllTargets(Context context, int pageSize, long offset) {
+        try {
+            return this.solrSuggestionStorageService.findAllTargets(context, sourceName, pageSize, offset);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Suggestion findUnprocessedSuggestion(Context context, UUID target, String id) {
+        try {
+            return this.solrSuggestionStorageService.findUnprocessedSuggestion(context, sourceName, target, id);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public SuggestionTarget findTarget(Context context, UUID target) {
+        try {
+            return this.solrSuggestionStorageService.findTarget(context, sourceName, target);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void rejectSuggestion(Context context, UUID target, String idPart) {
+        Suggestion suggestion = findUnprocessedSuggestion(context, target, idPart);
+        try {
+            solrSuggestionStorageService.flagSuggestionAsProcessed(suggestion);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void flagRelatedSuggestionsAsProcessed(Context context, ExternalDataObject externalDataObject) {
+        if (!isExternalDataObjectPotentiallySuggested(context, externalDataObject)) {
+            return;
+        }
+        try {
+            solrSuggestionStorageService.flagAllSuggestionAsProcessed(sourceName, externalDataObject.getId());
+        } catch (SolrServerException | IOException e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * check if the externalDataObject may have suggestion
+     * @param context
+     * @param externalDataObject
+     * @return true if the externalDataObject could be suggested by this provider
+     *         (i.e. it comes from a DataProvider used by this suggestor)
+     */
+    protected abstract boolean isExternalDataObjectPotentiallySuggested(Context context,
+            ExternalDataObject externalDataObject);
+}

dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageService.java

@@ -0,0 +1,191 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.suggestion;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.core.Context;
+
+/**
+ * Service to deal with the local suggestion solr core used by the
+ * SolrSuggestionProvider(s)
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ * @author Luca Giamminonni (luca.giamminonni at 4science dot it)
+ *
+ */
+public interface SolrSuggestionStorageService {
+    public static final String SOURCE = "source";
+    /** This is the URI Part of the suggestion source:target:id */
+    public static final String SUGGESTION_FULLID = "suggestion_fullid";
+    public static final String SUGGESTION_ID = "suggestion_id";
+    public static final String TARGET_ID = "target_id";
+    public static final String TITLE = "title";
+    public static final String DATE = "date";
+    public static final String DISPLAY = "display";
+    public static final String CONTRIBUTORS = "contributors";
+    public static final String ABSTRACT = "abstract";
+    public static final String CATEGORY = "category";
+    public static final String EXTERNAL_URI = "external-uri";
+    public static final String PROCESSED = "processed";
+    public static final String SCORE = "trust";
+    public static final String EVIDENCES = "evidences";
+
+    /**
+     * Add a new suggestion to SOLR
+     * 
+     * @param suggestion
+     * @param force true if the suggestion must be reindexed
+     * @param commit
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void addSuggestion(Suggestion suggestion, boolean force, boolean commit)
+            throws SolrServerException, IOException;
+
+    /**
+     * Return true if the suggestion is already in SOLR and flagged as processed
+     * 
+     * @param suggestion
+     * @return true if the suggestion is already in SOLR and flagged as processed
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public boolean exist(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Delete a suggestion from SOLR if any
+     * 
+     * @param suggestion
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void deleteSuggestion(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Flag a suggestion as processed in SOLR if any
+     * 
+     * @param suggestion
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void flagSuggestionAsProcessed(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Delete all the suggestions from SOLR if any related to a specific target
+     * 
+     * @param target
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void deleteTarget(SuggestionTarget target) throws SolrServerException, IOException;
+
+    /**
+     * Performs an explicit commit, causing pending documents to be committed for
+     * indexing.
+     *
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    void commit() throws SolrServerException, IOException;
+
+    /**
+     * Flag all the suggestion related to the given source and id as processed.
+     *
+     * @param  source              the source name
+     * @param  idPart              the id's last part
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    void flagAllSuggestionAsProcessed(String source, String idPart) throws SolrServerException, IOException;
+
+    /**
+     * Count all the targets related to the given source.
+     *
+     * @param  source              the source name
+     * @return                     the target's count
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    long countAllTargets(Context context, String source) throws SolrServerException, IOException;
+
+    /**
+     * Count all the unprocessed suggestions related to the given source and target.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @return                     the suggestion count
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    long countUnprocessedSuggestionByTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find all the unprocessed suggestions related to the given source and target.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @param  pageSize            the page size
+     * @param  offset              the page offset
+     * @param  ascending           true to retrieve the suggestions ordered by score
+     *                             ascending
+     * @return                     the found suggestions
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    List<Suggestion> findAllUnprocessedSuggestions(Context context, String source, UUID target,
+        int pageSize, long offset, boolean ascending) throws SolrServerException, IOException;
+
+    /**
+     *
+     * Find all the suggestion targets related to the given source.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  pageSize            the page size
+     * @param  offset              the page offset
+     * @return                     the found suggestion targets
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find an unprocessed suggestion by the given source, target id and suggestion
+     * id.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @param  id                  the suggestion id
+     * @return                     the suggestion, if any
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    Suggestion findUnprocessedSuggestion(Context context, String source, UUID target, String id)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find a suggestion target by the given source and target.
+     * 
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @return                     the suggestion target, if any
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    SuggestionTarget findTarget(Context context, String source, UUID target) throws SolrServerException, IOException;
+}

dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageServiceImpl.java

@@ -0,0 +1,361 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.suggestion;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.SortClause;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.FacetParams;
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Service to deal with the local suggestion solr core used by the
+ * SolrSuggestionProvider(s)
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ *
+ */
+public class SolrSuggestionStorageServiceImpl implements SolrSuggestionStorageService {
+
+    private static final Logger log = LogManager.getLogger(SolrSuggestionStorageServiceImpl.class);
+
+    protected SolrClient solrSuggestionClient;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * Get solr client which use suggestion core
+     * 
+     * @return solr client
+     */
+    protected SolrClient getSolr() {
+        if (solrSuggestionClient == null) {
+            String solrService = DSpaceServicesFactory.getInstance().getConfigurationService()
+                    .getProperty("suggestion.solr.server", "http://localhost:8983/solr/suggestion");
+            solrSuggestionClient = new HttpSolrClient.Builder(solrService).build();
+        }
+        return solrSuggestionClient;
+    }
+
+    @Override
+    public void addSuggestion(Suggestion suggestion, boolean force, boolean commit)
+            throws SolrServerException, IOException {
+        if (force || !exist(suggestion)) {
+            ObjectMapper jsonMapper = new JsonMapper();
+            jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            SolrInputDocument document = new SolrInputDocument();
+            document.addField(SOURCE, suggestion.getSource());
+            // suggestion id is written as concatenation of
+            // source + ":" + targetID + ":" + idPart (of externalDataObj)
+            String suggestionFullID = suggestion.getID();
+            document.addField(SUGGESTION_FULLID, suggestionFullID);
+            document.addField(SUGGESTION_ID, suggestionFullID.split(":", 3)[2]);
+            document.addField(TARGET_ID, suggestion.getTarget().getID().toString());
+            document.addField(DISPLAY, suggestion.getDisplay());
+            document.addField(TITLE, getFirstValue(suggestion, "dc", "title", null));
+            document.addField(DATE, getFirstValue(suggestion, "dc", "date", "issued"));
+            document.addField(CONTRIBUTORS, getAllValues(suggestion, "dc", "contributor", "author"));
+            document.addField(ABSTRACT, getFirstValue(suggestion, "dc", "description", "abstract"));
+            document.addField(CATEGORY, getAllValues(suggestion, "dc", "source", null));
+            document.addField(EXTERNAL_URI, suggestion.getExternalSourceUri());
+            document.addField(SCORE, suggestion.getScore());
+            document.addField(PROCESSED, false);
+            document.addField(EVIDENCES, jsonMapper.writeValueAsString(suggestion.getEvidences()));
+            getSolr().add(document);
+            if (commit) {
+                getSolr().commit();
+            }
+        }
+    }
+
+    @Override
+    public void commit() throws SolrServerException, IOException {
+        getSolr().commit();
+    }
+
+    private List<String> getAllValues(Suggestion suggestion, String schema, String element, String qualifier) {
+        return suggestion.getMetadata().stream()
+                .filter(st -> StringUtils.isNotBlank(st.getValue()) && StringUtils.equals(st.getSchema(), schema)
+                        && StringUtils.equals(st.getElement(), element)
+                        && StringUtils.equals(st.getQualifier(), qualifier))
+                .map(st -> st.getValue()).collect(Collectors.toList());
+    }
+
+    private String getFirstValue(Suggestion suggestion, String schema, String element, String qualifier) {
+        return suggestion.getMetadata().stream()
+            .filter(st -> StringUtils.isNotBlank(st.getValue())
+                && StringUtils.equals(st.getSchema(), schema)
+                        && StringUtils.equals(st.getElement(), element)
+                        && StringUtils.equals(st.getQualifier(), qualifier))
+                .map(st -> st.getValue()).findFirst().orElse(null);
+    }
+
+    @Override
+    public boolean exist(Suggestion suggestion) throws SolrServerException, IOException {
+        SolrQuery query = new SolrQuery(
+                SUGGESTION_FULLID + ":\"" + suggestion.getID() + "\" AND " + PROCESSED + ":true");
+        return getSolr().query(query).getResults().getNumFound() == 1;
+    }
+
+    @Override
+    public void deleteSuggestion(Suggestion suggestion) throws SolrServerException, IOException {
+        getSolr().deleteById(suggestion.getID());
+        getSolr().commit();
+    }
+
+    @Override
+    public void flagSuggestionAsProcessed(Suggestion suggestion) throws SolrServerException, IOException {
+        SolrInputDocument sdoc = new SolrInputDocument();
+        sdoc.addField(SUGGESTION_FULLID, suggestion.getID());
+        Map<String, Object> fieldModifier = new HashMap<>(1);
+        fieldModifier.put("set", true);
+        sdoc.addField(PROCESSED, fieldModifier); // add the map as the field value
+        getSolr().add(sdoc);
+        getSolr().commit();
+    }
+
+    @Override
+    public void flagAllSuggestionAsProcessed(String source, String idPart) throws SolrServerException, IOException {
+        SolrQuery query = new SolrQuery(SOURCE + ":" + source + " AND " + SUGGESTION_ID + ":\"" + idPart + "\"");
+        query.setRows(Integer.MAX_VALUE);
+        query.setFields(SUGGESTION_FULLID);
+        SolrDocumentList results = getSolr().query(query).getResults();
+        if (results.getNumFound() > 0) {
+            for (SolrDocument rDoc : results) {
+                SolrInputDocument sdoc = new SolrInputDocument();
+                sdoc.addField(SUGGESTION_FULLID, rDoc.getFieldValue(SUGGESTION_FULLID));
+                Map<String, Object> fieldModifier = new HashMap<>(1);
+                fieldModifier.put("set", true);
+                sdoc.addField(PROCESSED, fieldModifier); // add the map as the field value
+                getSolr().add(sdoc);
+            }
+        }
+        getSolr().commit();
+    }
+
+    @Override
+    public void deleteTarget(SuggestionTarget target) throws SolrServerException, IOException {
+        getSolr().deleteByQuery(
+                SOURCE + ":" + target.getSource() + " AND " + TARGET_ID + ":" + target.getTarget().getID().toString());
+        getSolr().commit();
+    }
+
+    @Override
+    public long countAllTargets(Context context, String source) throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(PROCESSED + ":false");
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TARGET_ID);
+        solrQuery.setFacetLimit(Integer.MAX_VALUE);
+        QueryResponse response = getSolr().query(solrQuery);
+        return response.getFacetField(TARGET_ID).getValueCount();
+    }
+
+    @Override
+    public long countUnprocessedSuggestionByTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+
+        QueryResponse response = getSolr().query(solrQuery);
+        return response.getResults().getNumFound();
+    }
+
+    @Override
+    public List<Suggestion> findAllUnprocessedSuggestions(Context context, String source, UUID target,
+        int pageSize, long offset, boolean ascending) throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(pageSize);
+        solrQuery.setStart((int) offset);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+
+        if (ascending) {
+            solrQuery.addSort(SortClause.asc("trust"));
+        } else {
+            solrQuery.addSort(SortClause.desc("trust"));
+        }
+
+        solrQuery.addSort(SortClause.desc("date"));
+        solrQuery.addSort(SortClause.asc("title"));
+
+        QueryResponse response = getSolr().query(solrQuery);
+        List<Suggestion> suggestions = new ArrayList<Suggestion>();
+        for (SolrDocument solrDoc : response.getResults()) {
+            suggestions.add(convertSolrDoc(context, solrDoc, source));
+        }
+        return suggestions;
+
+    }
+
+    @Override
+    public List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset)
+        throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(PROCESSED + ":false");
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TARGET_ID);
+        solrQuery.setParam(FacetParams.FACET_OFFSET, String.valueOf(offset));
+        solrQuery.setFacetLimit((int) (pageSize));
+        QueryResponse response = getSolr().query(solrQuery);
+        FacetField facetField = response.getFacetField(TARGET_ID);
+        List<SuggestionTarget> suggestionTargets = new ArrayList<SuggestionTarget>();
+        int idx = 0;
+        for (Count c : facetField.getValues()) {
+            SuggestionTarget target = new SuggestionTarget();
+            target.setSource(source);
+            target.setTotal((int) c.getCount());
+            target.setTarget(findItem(context, c.getName()));
+            suggestionTargets.add(target);
+            idx++;
+        }
+        return suggestionTargets;
+
+    }
+
+    @Override
+    public Suggestion findUnprocessedSuggestion(Context context, String source, UUID target, String id)
+        throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(1);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            SUGGESTION_ID + ":\"" + id + "\"",
+            PROCESSED + ":false");
+
+        SolrDocumentList results = getSolr().query(solrQuery).getResults();
+        return isEmpty(results) ? null : convertSolrDoc(context, results.get(0), source);
+    }
+
+    @Override
+    public SuggestionTarget findTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+        QueryResponse response = getSolr().query(solrQuery);
+        SuggestionTarget sTarget = new SuggestionTarget();
+        sTarget.setSource(source);
+        sTarget.setTotal((int) response.getResults().getNumFound());
+        Item itemTarget = findItem(context, target);
+        if (itemTarget != null) {
+            sTarget.setTarget(itemTarget);
+        } else {
+            return null;
+        }
+        return sTarget;
+    }
+
+    private Suggestion convertSolrDoc(Context context, SolrDocument solrDoc, String sourceName) {
+        Item target = findItem(context, (String) solrDoc.getFieldValue(TARGET_ID));
+
+        Suggestion suggestion = new Suggestion(sourceName, target, (String) solrDoc.getFieldValue(SUGGESTION_ID));
+        suggestion.setDisplay((String) solrDoc.getFieldValue(DISPLAY));
+        suggestion.getMetadata()
+            .add(new MetadataValueDTO("dc", "title", null, null, (String) solrDoc.getFieldValue(TITLE)));
+        suggestion.getMetadata()
+            .add(new MetadataValueDTO("dc", "date", "issued", null, (String) solrDoc.getFieldValue(DATE)));
+        suggestion.getMetadata().add(
+            new MetadataValueDTO("dc", "description", "abstract", null, (String) solrDoc.getFieldValue(ABSTRACT)));
+
+        suggestion.setExternalSourceUri((String) solrDoc.getFieldValue(EXTERNAL_URI));
+        if (solrDoc.containsKey(CATEGORY)) {
+            for (Object o : solrDoc.getFieldValues(CATEGORY)) {
+                suggestion.getMetadata().add(
+                    new MetadataValueDTO("dc", "source", null, null, (String) o));
+            }
+        }
+        if (solrDoc.containsKey(CONTRIBUTORS)) {
+            for (Object o : solrDoc.getFieldValues(CONTRIBUTORS)) {
+                suggestion.getMetadata().add(
+                    new MetadataValueDTO("dc", "contributor", "author", null, (String) o));
+            }
+        }
+        String evidencesJson = (String) solrDoc.getFieldValue(EVIDENCES);
+        ObjectMapper jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        List<SuggestionEvidence> evidences = new LinkedList<SuggestionEvidence>();
+        try {
+            evidences = jsonMapper.readValue(evidencesJson, new TypeReference<List<SuggestionEvidence>>() {});
+        } catch (JsonProcessingException e) {
+            log.error(e);
+        }
+        suggestion.getEvidences().addAll(evidences);
+        return suggestion;
+    }
+
+    private Item findItem(Context context, UUID itemId) {
+        try {
+            return itemService.find(context, itemId);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Item findItem(Context context, String itemId) {
+        return findItem(context, UUIDUtils.fromString(itemId));
+    }
+}

dspace-api/src/main/java/org/dspace/app/suggestion/Suggestion.java

@@ -0,0 +1,99 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.suggestion;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+
+/**
+ * This entity contains metadatas that should be added to the targeted Item
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class Suggestion {
+
+    /** id of the suggestion */
+    private String id;
+
+    /** the dc.title of the item */
+    private String display;
+
+    /** the external source name the suggestion comes from */
+    private String source;
+
+    /** external uri of the item */
+    private String externalSourceUri;
+
+    /** item targeted by this suggestion */
+    private Item target;
+
+    private List<SuggestionEvidence> evidences = new LinkedList<SuggestionEvidence>();
+
+    private List<MetadataValueDTO> metadata = new LinkedList<MetadataValueDTO>();
+
+    /** suggestion creation
+     * @param source name of the external source
+     * @param target the targeted item in repository
+     * @param idPart external item id, used mainly for suggestion @see #id creation
+     * */
+    public Suggestion(String source, Item target, String idPart) {
+        this.source = source;
+        this.target = target;
+        this.id = source + ":" + target.getID().toString() + ":" + idPart;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getExternalSourceUri() {
+        return externalSourceUri;
+    }
+
+    public void setExternalSourceUri(String externalSourceUri) {
+        this.externalSourceUri = externalSourceUri;
+    }
+
+    public List<SuggestionEvidence> getEvidences() {
+        return evidences;
+    }
+
+    public List<MetadataValueDTO> getMetadata() {
+        return metadata;
+    }
+
+    public Item getTarget() {
+        return target;
+    }
+
+    public String getID() {
+        return id;
+    }
+
+    public Double getScore() {
+        if (evidences != null && evidences.size() > 0) {
+            double score = 0;
+            for (SuggestionEvidence evidence : evidences) {
+                score += evidence.getScore();
+            }
+            return score;
+        }
+        return null;
+    }
+}

dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionEvidence.java

@@ -0,0 +1,61 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.suggestion;
+
+/**
+ * This DTO class is returned by an {@link org.dspace.app.suggestion.openaire.EvidenceScorer} to model the concept of
+ * an evidence / fact that has been used to evaluate the precision of a suggestion increasing or decreasing the score
+ * of the suggestion.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionEvidence {
+
+    /** name of the evidence */
+    private String name;
+
+    /** positive or negative value to influence the score of the suggestion */
+    private double score;
+
+    /** additional notes */
+    private String notes;
+
+    public SuggestionEvidence() {
+    }
+
+    public SuggestionEvidence(String name, double score, String notes) {
+        this.name = name;
+        this.score = score;
+        this.notes = notes;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getScore() {
+        return score;
+    }
+
+    public void setScore(double score) {
+        this.score = score;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+}