aboutsummaryrefslogtreecommitdiffstats
path: root/applications/guard/src
diff options
context:
space:
mode:
authoradheli.tavares <adheli.tavares@est.tech>2023-09-06 09:54:17 +0100
committeradheli.tavares <adheli.tavares@est.tech>2023-09-22 16:02:14 +0100
commit56c7a53919852f69767f80ae5d671794a985a163 (patch)
treecd467599448b80b8f36bd53ef7c161bd7002b991 /applications/guard/src
parent88b6b1fe6db0c107362670520b8437b1e163eec4 (diff)
Upgrade Java 17 in xacml-pdp
Issue-ID: POLICY-4821 Change-Id: I96843c7be9f0ef93ca76c85d682fffb2bdfaff13 Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'applications/guard/src')
-rw-r--r--applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java6
-rw-r--r--applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java5
-rw-r--r--applications/guard/src/test/resources/META-INF/persistence.xml2
-rw-r--r--applications/guard/src/test/resources/xacml.properties8
4 files changed, 11 insertions, 10 deletions
diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
index 5cdb6abf..31e576ff 100644
--- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
+++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
@@ -3,7 +3,7 @@
* ONAP
* ================================================================================
* Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021,2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import com.att.research.xacml.api.Response;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Persistence;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -39,8 +41,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.ServiceLoader;
import java.util.UUID;
-import javax.persistence.EntityManager;
-import javax.persistence.Persistence;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
index 873df756..4e7bb12f 100644
--- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
+++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
@@ -3,6 +3,7 @@
* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +26,8 @@ package org.onap.policy.xacml.pdp.application.guard;
import static org.assertj.core.api.Assertions.assertThat;
import com.att.research.xacml.api.Response;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Persistence;
import java.io.File;
import java.io.IOException;
import java.time.Instant;
@@ -34,8 +37,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.ServiceLoader;
import java.util.UUID;
-import javax.persistence.EntityManager;
-import javax.persistence.Persistence;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/applications/guard/src/test/resources/META-INF/persistence.xml b/applications/guard/src/test/resources/META-INF/persistence.xml
index 0df6aeb3..2b560062 100644
--- a/applications/guard/src/test/resources/META-INF/persistence.xml
+++ b/applications/guard/src/test/resources/META-INF/persistence.xml
@@ -25,7 +25,7 @@
<class>org.onap.policy.guard.OperationsHistory</class>
<properties>
- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+ <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.format_sql" value="false" />
diff --git a/applications/guard/src/test/resources/xacml.properties b/applications/guard/src/test/resources/xacml.properties
index 11a51651..7287f3a3 100644
--- a/applications/guard/src/test/resources/xacml.properties
+++ b/applications/guard/src/test/resources/xacml.properties
@@ -48,7 +48,7 @@ xacml.pip.engines=count-recent-operations,get-operation-outcome
# JPA Properties
#
eclipselink.target-database=Auto
-javax.persistence.jdbc.driver=org.h2.Driver
-javax.persistence.jdbc.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE
-javax.persistence.jdbc.user=policy
-javax.persistence.jdbc.password=UDAxaWNZ
+jakarta.persistence.jdbc.driver=org.h2.Driver
+jakarta.persistence.jdbc.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE
+jakarta.persistence.jdbc.user=policy
+jakarta.persistence.jdbc.password=UDAxaWNZ