#414: update XACML engine

oehf · Jul 19, 2023 · 1f18371 · 1f18371
1 parent 669f30c
commit 1f18371
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/commons/ihe/hpd/pom.xml b/commons/ihe/hpd/pom.xml
@@ -41,6 +41,14 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <!-- Dependencies for test -->
         <dependency>

diff --git a/...ons/ihe/hpd/src/main/java/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/LDAPResult.java b/...ons/ihe/hpd/src/main/java/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/LDAPResult.java
@@ -16,18 +16,12 @@
 package org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.xml.bind.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-import jakarta.xml.bind.annotation.XmlSeeAlso;
-import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -20,7 +20,7 @@
         <groovy-version>4.0.12</groovy-version>
         <hapi-version>2.3</hapi-version>
         <hapi-fhir-version>6.6.1</hapi-fhir-version>
-        <herasaf-version>2.0.4</herasaf-version>
+        <herasaf-version>3.0.2</herasaf-version>
         <ipf-gazelle-version>3.0-SNAPSHOT</ipf-gazelle-version>
         <ipf-oht-mdht-version>1.2.0.201212201425</ipf-oht-mdht-version>
         <jaxb-version>4.0.2</jaxb-version>

diff --git a/tutorials/xds/pom.xml b/tutorials/xds/pom.xml
@@ -87,8 +87,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.security.auth.message</groupId>
-            <artifactId>javax.security.auth.message-api</artifactId>
+            <groupId>jakarta.security.auth.message</groupId>
+            <artifactId>jakarta.security.auth.message-api</artifactId>
             <scope>compile</scope>
         </dependency>