From d2148c71659f10291187329ca45459da54f2aa99 Mon Sep 17 00:00:00 2001
From: Lennard Golsch <36492865+golsch@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:32:14 +0200
Subject: [PATCH] fix dependencies (#61)

* fixed dependencies

* fixed forbiddenapis
---
 pom.xml                                       | 162 ++++++++++++------
 .../mapper/ContactRequestMapper.java          |   3 +-
 .../service/ContactRequestServiceImpl.java    |   3 +-
 3 files changed, 112 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e526a3c..70fd67b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,10 @@
   <version>2023.06-SNAPSHOT</version>
   <properties>
     <MCR.AppName>digibib</MCR.AppName>
+    <cage.version>1.0</cage.version>
     <java.target.version>17</java.target.version>
     <node.version>v16.19.1</node.version>
+    <sun.mail.version>2.0.1</sun.mail.version>
     <yarn.version>v1.22.19</yarn.version>
   </properties>
   <build>
@@ -191,163 +193,215 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.github.cage</groupId>
       <artifactId>cage</artifactId>
-      <version>1.0</version>
+      <version>${cage.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.github.jsonld-java</groupId>
       <artifactId>jsonld-java</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.sun.mail</groupId>
       <artifactId>dsn</artifactId>
-      <version>2.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-annotations-jakarta</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.inject</groupId>
-      <artifactId>jakarta.inject-api</artifactId>
+      <version>${sun.mail.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta.persistence</groupId>
-      <artifactId>jakarta.persistence-api</artifactId>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
+      <version>${sun.mail.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
+      <groupId>org.eclipse.rdf4j</groupId>
+      <artifactId>rdf4j-model</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
+      <groupId>org.eclipse.rdf4j</groupId>
+      <artifactId>rdf4j-model-api</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta.ws.rs</groupId>
-      <artifactId>jakarta.ws.rs-api</artifactId>
+      <groupId>org.eclipse.rdf4j</groupId>
+      <artifactId>rdf4j-rio-api</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-model</artifactId>
+      <artifactId>rdf4j-rio-jsonld</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-model-api</artifactId>
+      <artifactId>rdf4j-rio-rdfxml</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-server</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>8.0.1.Final</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.mycore</groupId>
+      <artifactId>mycore-orcid2</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <!-- provided by mir-module -->
+        <exclusion>
+          <groupId>org.mycore</groupId>
+          <artifactId>mycore-user2</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.mycore</groupId>
-      <artifactId>mycore-base</artifactId>
-      <type>test-jar</type>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <!-- provided by mir-module > mycore-acl -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mycore</groupId>
-      <artifactId>mycore-orcid2</artifactId>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <!-- provided by mir-module -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mycore</groupId>
-      <artifactId>selenium-utils</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <!-- provided by mir-module > mycore-acl -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-support</artifactId>
-      <version>3.141.59</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <!-- provided by mir-module -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <!-- provided by mir-module > mycore-pi -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-api</artifactId>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-jsonld</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-rdfxml</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>jdom2</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-base</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-cronjob</artifactId>
+      <!-- provided by mycore-jobqueue -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-jobqueue</artifactId>
+      <!-- provided by mir-module > mycore-jobqueue -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-mods</artifactId>
+      <!-- provided by mir-module -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-restapi</artifactId>
+      <!-- provided by mir-module > mycore-acl -->
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mycore</groupId>
+      <artifactId>mycore-base</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mycore</groupId>
+      <artifactId>selenium-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-api</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-support</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <!-- conflict with mockito -->
+        <exclusion>
+          <groupId>net.bytebuddy</groupId>
+          <artifactId>byte-buddy</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/de/vzg/reposis/digibib/contactrequest/mapper/ContactRequestMapper.java b/src/main/java/de/vzg/reposis/digibib/contactrequest/mapper/ContactRequestMapper.java
index 6c06a40d..44e49e87 100644
--- a/src/main/java/de/vzg/reposis/digibib/contactrequest/mapper/ContactRequestMapper.java
+++ b/src/main/java/de/vzg/reposis/digibib/contactrequest/mapper/ContactRequestMapper.java
@@ -19,6 +19,7 @@
 package de.vzg.reposis.digibib.contactrequest.mapper;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 
 import de.vzg.reposis.digibib.contactrequest.dto.ContactRequestDto;
@@ -82,7 +83,7 @@ public static ContactRequestDto toDto(ContactRequest contactRequest) {
     public static ContactRequestSummaryDto toSummaryDto(ContactRequest contactRequest) {
         final List<String> emails = contactRequest.getEmailContactAttempts().stream()
             .map(ContactAttempt::getRecipientReference).distinct().toList();
-        final String statusString = contactRequest.getStatus().toString().toLowerCase();
+        final String statusString = contactRequest.getStatus().toString().toLowerCase(Locale.ROOT);
         final ContactRequestSummaryDto contactRequestSummaryDto = new ContactRequestSummaryDto();
         contactRequestSummaryDto.setStatusString(statusString);
         contactRequestSummaryDto.setEmails(emails);
diff --git a/src/main/java/de/vzg/reposis/digibib/contactrequest/service/ContactRequestServiceImpl.java b/src/main/java/de/vzg/reposis/digibib/contactrequest/service/ContactRequestServiceImpl.java
index e450a204..38468688 100644
--- a/src/main/java/de/vzg/reposis/digibib/contactrequest/service/ContactRequestServiceImpl.java
+++ b/src/main/java/de/vzg/reposis/digibib/contactrequest/service/ContactRequestServiceImpl.java
@@ -19,6 +19,7 @@
 package de.vzg.reposis.digibib.contactrequest.service;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
 
@@ -84,7 +85,7 @@ public ContactRequestDto createContactRequest(ContactRequestDto contactRequestDt
         validatorFacade.getContactRequestValidator().validate(contactRequestDto);
         final ContactRequest contactRequest = ContactRequestMapper.toEntity(contactRequestDto);
         contactRequest.setId(null);
-        contactRequest.setCreated(LocalDateTime.now());
+        contactRequest.setCreated(LocalDateTime.now(ZoneId.systemDefault()));
         contactRequest.setCreatedBy(MCRSessionMgr.getCurrentSession().getUserInformation().getUserID());
         contactRequest.setStatus(ContactRequest.Status.OPEN);
         final ContactRequest insertedContactRequest = contactRequestRepository.save(contactRequest);