Merge branch 'main' into w2p-113996_Improvements-submission-sections-…

…main
atmire · Apr 22, 2024 · 9731109 · 9731109
2 parents 00e091a + b6c5fbb
commit 9731109
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
@@ -738,27 +738,16 @@
 
         <!-- 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>
+            <groupId>org.dspace</groupId>
             <artifactId>orcid-model-jakarta</artifactId>
             <version>3.3.0</version>
             <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.jarkarta.rs</groupId>
-                    <artifactId>jackson-jakarta-rs-json-provider</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.javassist</groupId>
                     <artifactId>javassist</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.swagger.core.v3</groupId>
-                    <artifactId>swagger-jaxrs2-jakarta</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -1177,7 +1177,7 @@ protected WorkspaceItem returnToWorkspace(Context c, XmlWorkflowItem wfi)
     public String getEPersonName(EPerson ePerson) {
         String submitter = ePerson.getFullName();
 
-        submitter = submitter + "(" + ePerson.getEmail() + ")";
+        submitter = submitter + " (" + ePerson.getEmail() + ")";
 
         return submitter;
     }

diff --git a/...rver-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java b/...rver-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java
@@ -175,8 +175,10 @@ public void testSubGroupOfAdminGroup() throws Exception {
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isCollectionAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -284,8 +286,10 @@ public void testSubSubGroupOfAdminGroup() throws Exception {
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isCollectionAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")

diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
@@ -45,6 +45,20 @@
                     <groupId>org.glassfish.jersey.core</groupId>
                     <artifactId>jersey-common</artifactId>
                 </exclusion>
+                <!-- Exclude older Apache Geronimo dependencies as these are not Jakarta EE compatible
+                     and can cause runtime errors with newer Jakarta EE compatible dependencies -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@
                                         <version>${java.version}</version>
                                     </requireJavaVersion>
                                     <requireMavenVersion>
-                                        <version>[3.0.5,)</version>
+                                        <version>[3.8,)</version>
                                     </requireMavenVersion>
                                 </rules>
                             </configuration>
@@ -1994,14 +1994,5 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <!-- For Jakarta EE version of "orcid-model". REMOVE once official "orcid-model" is updated to Jakarta,
-             see https://github.com/ORCID/orcid-model/issues/50-->
-        <repository>
-            <id>oicr.on.ca</id>
-            <url>https://artifacts.oicr.on.ca/artifactory/collab-release/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 </project>