diff options
Diffstat (limited to 'applications/guard')
5 files changed, 16 insertions, 14 deletions
diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index bd6dcbe3..7a793c8b 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -20,18 +20,19 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.xacml-pdp.applications</groupId> <artifactId>applications</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>xacml-guard</artifactId> <name>${project.artifactId}</name> - <description>This modules contain an application that implements onap.Guard policy-types for XACML PDP.</description> + <description>This modules contain an application that implements onap.Guard policy-types for XACML PDP. + </description> <dependencies> <dependency> @@ -50,6 +51,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - </dependencies> + </dependencies> </project> 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 |