From 79db606277f959ca71eaa74c3750f33006cabaac Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 5 Sep 2023 17:32:31 +0200
Subject: chore(core): some more clean-up tasks to Java 17

---
 .../eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java    | 3 +++
 eaaf_modules/eaaf_module_moa-sig/pom.xml                            | 6 ++++++
 eaaf_modules/eaaf_module_pvp2_core/pom.xml                          | 6 ------
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'eaaf_modules')

diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
index dd3e9ea7..3733c847 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
@@ -33,6 +33,7 @@ import at.gv.egiz.eaaf.modules.auth.sl20.utils.JsonMapper;
 import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20Constants;
 import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20JsonExtractorUtils;
 import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20ResponseUtils;
+import jakarta.annotation.Nonnull;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +56,7 @@ public abstract class AbstractReceiveQualEidTask extends AbstractAuthServletTask
       sl20Result = getSl20OperationFromHttp(request);
       revisionsLogger.logEvent(pendingReq, EventCodes.AUTHPROCESS_SL20_DATAURL_IP, request.getRemoteAddr());
 
+      // process SL2.0 operation
       internalExecute(request, response, sl20Result);
 
     } catch (final Exception e) {
@@ -142,6 +144,7 @@ public abstract class AbstractReceiveQualEidTask extends AbstractAuthServletTask
     }
   }
 
+  @Nonnull
   private String getSl20OperationFromHttp(HttpServletRequest request)
       throws SL20Exception, IOException, FileUploadException {
     // get SL2.0 command or result from HTTP request
diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml
index c8a30654..3844df74 100644
--- a/eaaf_modules/eaaf_module_moa-sig/pom.xml
+++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml
@@ -101,6 +101,12 @@
 	<dependency>
 		<groupId>moaSig</groupId>
 		<artifactId>common</artifactId>
+		<exclusions>
+			<exclusion>
+				<groupId>xml-apis</groupId>
+				<artifactId>xml-apis</artifactId>
+			</exclusion>
+		</exclusions>
 	</dependency>
 	<dependency>
         <groupId>at.gv.egovernment.moa.sig</groupId>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 0afca29a..9da56bba 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -119,12 +119,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.4.01</version>
-      <scope>test</scope>    
-    </dependency>
     <dependency>
       <groupId>at.asitplus.hsmfacade</groupId>
       <artifactId>provider</artifactId>
-- 
cgit v1.2.3