From bfed5f0df434cb4adecf49eaa592b54defd3ddc5 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Tue, 24 Oct 2023 13:41:38 -0600
Subject: [PATCH] Dspace 7.6 Updates (#1)

* Remove SupervisorService

* Remove SupervisedItemService, add SubscribeService

* Add log4j dependencies for compilation + testing

* Fix typo
---
 pom.xml                                               | 11 +++++++++++
 .../java/org/dspace/TestContentServiceFactory.java    | 10 +++++-----
 .../java/org/dspace/TestEPersonServiceFactory.java    |  5 -----
 .../java/org/dspace/pack/bagit/BagItPackerTest.java   |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 772b113..9e89596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,6 +307,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.20.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- JAXB is no longer bundled for java 11
              compile only as this will be brought in through dspace-api in 7.x -->
diff --git a/src/test/java/org/dspace/TestContentServiceFactory.java b/src/test/java/org/dspace/TestContentServiceFactory.java
index 6d2cdfb..1c6d46a 100644
--- a/src/test/java/org/dspace/TestContentServiceFactory.java
+++ b/src/test/java/org/dspace/TestContentServiceFactory.java
@@ -31,8 +31,8 @@
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.content.service.SiteService;
-import org.dspace.content.service.SupervisedItemService;
 import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.eperson.service.SubscribeService;
 
 /**
  * A {@link ContentServiceFactory} which returns mock services
@@ -119,13 +119,13 @@ public InstallItemService getInstallItemService() {
     }
 
     @Override
-    public SupervisedItemService getSupervisedItemService() {
-        throw new UnsupportedOperationException();
+    public SiteService getSiteService() {
+        return siteService;
     }
 
     @Override
-    public SiteService getSiteService() {
-        return siteService;
+    public SubscribeService getSubscribeService() {
+        throw new UnsupportedOperationException();
     }
 
     @Override
diff --git a/src/test/java/org/dspace/TestEPersonServiceFactory.java b/src/test/java/org/dspace/TestEPersonServiceFactory.java
index 27e6e46..399e766 100644
--- a/src/test/java/org/dspace/TestEPersonServiceFactory.java
+++ b/src/test/java/org/dspace/TestEPersonServiceFactory.java
@@ -15,7 +15,6 @@
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.RegistrationDataService;
 import org.dspace.eperson.service.SubscribeService;
-import org.dspace.eperson.service.SupervisorService;
 
 /**
  * {@link EPersonServiceFactory} for testing
@@ -52,8 +51,4 @@ public SubscribeService getSubscribeService() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public SupervisorService getSupervisorService() {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/src/test/java/org/dspace/pack/bagit/BagItPackerTest.java b/src/test/java/org/dspace/pack/bagit/BagItPackerTest.java
index ad248da..2b94f30 100644
--- a/src/test/java/org/dspace/pack/bagit/BagItPackerTest.java
+++ b/src/test/java/org/dspace/pack/bagit/BagItPackerTest.java
@@ -42,7 +42,7 @@
 
 /**
  * Base class for all BagIt packing/unpacking tests. This performs initial setup so that the DSpaceKernel is not null
- * and so that some of the that are used through static contexts or have static initializers (e.g.
+ * and so that classes used through static contexts or have static initializers (e.g.
  * {@link org.dspace.services.factory.DSpaceServicesFactory}, {@link org.dspace.core.Context}) can initialize and
  * retrieve any classes which are necessary for basic operations.
  *