diff options
6 files changed, 24 insertions, 10 deletions
diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index 34b50d20..ad0ab63c 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -109,10 +109,22 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <!-- For testing --> diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/TicketErrorService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/TicketErrorService.java index 469a8cd3..c8eacccf 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/TicketErrorService.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/TicketErrorService.java @@ -42,7 +42,6 @@ import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import lombok.Builder; import lombok.Getter; -import lombok.var; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -102,7 +101,7 @@ public abstract class TicketErrorService implements IErrorService { if (!(errorData instanceof TicketErrorService.HandleData)) { throw new EaafException(IStatusMessenger.CODES_INTERNAL_ERROR_GENERIC); } - var ed = (TicketErrorService.HandleData) errorData; + HandleData ed = (TicketErrorService.HandleData) errorData; // inject all additional model parameters errorData.getAdditionalGuiModelElements().entrySet().forEach( 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 @@ -120,12 +120,6 @@ </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> <scope>test</scope> @@ -829,8 +829,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>${java.version}</source> + <target>${java.version}</target> </configuration> <executions> <execution> |