From 56c7a53919852f69767f80ae5d671794a985a163 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Wed, 6 Sep 2023 09:54:17 +0100 Subject: Upgrade Java 17 in xacml-pdp Issue-ID: POLICY-4821 Change-Id: I96843c7be9f0ef93ca76c85d682fffb2bdfaff13 Signed-off-by: adheli.tavares --- applications/common/pom.xml | 22 ++++----- .../xacml/application/common/PolicyApiCaller.java | 4 +- .../operationshistory/GetOperationOutcomePip.java | 3 +- .../xacml/application/common/std/StdOnapPip.java | 5 +- .../common/src/main/resources/persistence.xml | 4 +- .../application/common/PolicyApiCallerTest.java | 16 +++---- .../application/common/XacmlPolicyUtilsTest.java | 4 +- .../CountRecentOperationsPipTest.java | 8 ++-- .../GetOperationOutcomePipTest.java | 24 ++++------ .../common/std/StdMatchableTranslatorTest.java | 15 +++--- .../src/test/resources/META-INF/persistence.xml | 4 +- .../common/src/test/resources/test.properties | 8 ++-- applications/guard/pom.xml | 9 ++-- .../application/guard/GuardPdpApplicationTest.java | 6 +-- .../pdp/application/guard/SonCoordinationTest.java | 5 +- .../src/test/resources/META-INF/persistence.xml | 2 +- .../guard/src/test/resources/xacml.properties | 8 ++-- applications/match/pom.xml | 4 +- applications/monitoring/pom.xml | 5 +- applications/naming/pom.xml | 4 +- applications/native/pom.xml | 47 +++++++++--------- applications/optimization/pom.xml | 4 +- applications/pom.xml | 55 +++++++++++----------- 23 files changed, 133 insertions(+), 133 deletions(-) (limited to 'applications') diff --git a/applications/common/pom.xml b/applications/common/pom.xml index 5723deac..02de46fc 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -20,36 +20,34 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT common - - junit - junit - test - org.mockito mockito-core test - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + provided org.glassfish.jaxb jaxb-runtime + 4.0.2 com.h2database @@ -80,7 +78,7 @@ com.att.research.xacml xacml-pdp - 3.1.0 + 4.0.0 diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java index 0f0f7ea2..2ccc694a 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-2021 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. @@ -21,8 +21,8 @@ package org.onap.policy.pdp.xacml.application.common; +import jakarta.ws.rs.core.Response; import java.net.HttpURLConnection; -import javax.ws.rs.core.Response; import org.onap.policy.common.endpoints.http.client.HttpClient; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java index a2440d5b..ee80641c 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-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. @@ -26,9 +27,9 @@ import com.att.research.xacml.api.pip.PIPResponse; import com.att.research.xacml.std.pip.StdMutablePIPResponse; import com.att.research.xacml.std.pip.StdPIPResponse; import com.google.common.base.Strings; +import jakarta.persistence.NoResultException; import java.util.Arrays; import java.util.Collection; -import javax.persistence.NoResultException; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.onap.policy.pdp.xacml.application.common.std.StdOnapPip; import org.slf4j.Logger; diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java index d57da301..e0705f80 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2020 Bell Canada. 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. @@ -35,13 +36,13 @@ import com.att.research.xacml.std.datatypes.DataTypes; import com.att.research.xacml.std.pip.StdMutablePIPResponse; import com.att.research.xacml.std.pip.StdPIPRequest; import com.att.research.xacml.std.pip.engines.StdConfigurableEngine; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; import java.math.BigInteger; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; diff --git a/applications/common/src/main/resources/persistence.xml b/applications/common/src/main/resources/persistence.xml index e256bf99..037ba7bc 100644 --- a/applications/common/src/main/resources/persistence.xml +++ b/applications/common/src/main/resources/persistence.xml @@ -26,8 +26,8 @@ org.onap.policy.guard.OperationsHistory - - + + diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCallerTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCallerTest.java index 8a856698..0231c058 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCallerTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCallerTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019, 2021 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. @@ -28,16 +28,16 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Properties; import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java index 9ff81423..30bf232a 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2019-2020 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. @@ -39,7 +40,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Properties; -import java.util.stream.Collectors; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType; @@ -113,7 +113,7 @@ public class XacmlPolicyUtilsTest { // if (!"/".equals(File.separator)) { List fileProps = properties.keySet().stream().map(Object::toString) - .filter(key -> key.endsWith(".file")).collect(Collectors.toList()); + .filter(key -> key.endsWith(".file")).toList(); for (String fileProp : fileProps) { properties.setProperty(fileProp, properties.getProperty(fileProp).replace("/", File.separator)); } diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java index b2116f96..e564cd96 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java @@ -32,6 +32,9 @@ import com.att.research.xacml.api.pip.PIPFinder; import com.att.research.xacml.api.pip.PIPRequest; import com.att.research.xacml.api.pip.PIPResponse; import com.att.research.xacml.std.pip.StdPIPResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; import java.io.FileInputStream; import java.io.IOException; import java.sql.Date; @@ -41,9 +44,6 @@ import java.util.LinkedList; import java.util.Properties; import java.util.Queue; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; -import javax.persistence.Query; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -154,7 +154,7 @@ public class CountRecentOperationsPipTest { @Test public void testConfigure_DbException() throws Exception { - properties.put("javax.persistence.jdbc.url", "invalid"); + properties.put("jakarta.persistence.jdbc.url", "invalid"); assertThatCode(() -> pipEngine.configure("issuer", properties) ).doesNotThrowAnyException(); diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java index 61d923c2..bd53789f 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-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,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.att.research.xacml.api.Status; @@ -33,27 +35,23 @@ import com.att.research.xacml.api.pip.PIPFinder; import com.att.research.xacml.api.pip.PIPRequest; import com.att.research.xacml.api.pip.PIPResponse; import com.att.research.xacml.std.pip.StdPIPResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; import java.io.FileInputStream; import java.lang.reflect.Method; import java.time.Instant; import java.util.Date; import java.util.Properties; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.guard.OperationsHistory; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@RunWith(MockitoJUnitRunner.class) public class GetOperationOutcomePipTest { private static final Logger LOGGER = LoggerFactory.getLogger(GetOperationOutcomePipTest.class); private static final String TEST_PROPERTIES = "src/test/resources/test.properties"; @@ -63,17 +61,13 @@ public class GetOperationOutcomePipTest { private Properties properties; private GetOperationOutcomePip pipEngine; - @Mock - private PIPRequest pipRequest; + private final PIPRequest pipRequest = mock(PIPRequest.class); - @Mock - private PIPFinder pipFinder; + private final PIPFinder pipFinder = mock(PIPFinder.class); - @Mock - private PIPResponse resp1; + private final PIPResponse resp1 = mock(PIPResponse.class); - @Mock - private Status okStatus; + private final Status okStatus = mock(Status.class); /** * Create an instance of our engine and also the persistence @@ -148,7 +142,7 @@ public class GetOperationOutcomePipTest { @Test public void testConfigure_DbException() throws Exception { - properties.put("javax.persistence.jdbc.url", "invalid"); + properties.put("jakarta.persistence.jdbc.url", "invalid"); assertThatCode(() -> pipEngine.configure("issuer", properties) ).doesNotThrowAnyException(); diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslatorTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslatorTest.java index 1d2754b8..2edaf0e5 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslatorTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslatorTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-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. @@ -33,6 +34,13 @@ import com.att.research.xacml.api.IdReference; import com.att.research.xacml.api.Obligation; import com.att.research.xacml.api.Request; import com.att.research.xacml.std.StdStatusCode; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; @@ -43,13 +51,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; diff --git a/applications/common/src/test/resources/META-INF/persistence.xml b/applications/common/src/test/resources/META-INF/persistence.xml index ebddf87b..87896a60 100644 --- a/applications/common/src/test/resources/META-INF/persistence.xml +++ b/applications/common/src/test/resources/META-INF/persistence.xml @@ -26,8 +26,8 @@ org.onap.policy.guard.OperationsHistory - - + + diff --git a/applications/common/src/test/resources/test.properties b/applications/common/src/test/resources/test.properties index f4a0bf8e..77939c35 100644 --- a/applications/common/src/test/resources/test.properties +++ b/applications/common/src/test/resources/test.properties @@ -41,7 +41,7 @@ get-operation-outcome.persistenceunit=PipEngineTest # 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=P01icY +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=P01icY 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 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT xacml-guard ${project.artifactId} - This modules contain an application that implements onap.Guard policy-types for XACML PDP. + This modules contain an application that implements onap.Guard policy-types for XACML PDP. + @@ -50,6 +51,6 @@ ${project.version} test - + 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 @@ org.onap.policy.guard.OperationsHistory - + 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 diff --git a/applications/match/pom.xml b/applications/match/pom.xml index be9c59cb..2de6a03c 100644 --- a/applications/match/pom.xml +++ b/applications/match/pom.xml @@ -20,12 +20,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT xacml-match diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index e8925700..647d4238 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -3,6 +3,7 @@ ONAP Policy Engine - XACML PDP ================================================================================ Copyright (C) 2019-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. @@ -19,12 +20,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT xacml-monitoring diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index 7c9c5db8..9e53aa6a 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -20,12 +20,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT xacml-naming diff --git a/applications/native/pom.xml b/applications/native/pom.xml index e1b49315..19e58d7d 100644 --- a/applications/native/pom.xml +++ b/applications/native/pom.xml @@ -1,28 +1,29 @@ - - 4.0.0 - - org.onap.policy.xacml-pdp.applications - applications - 3.0.0-SNAPSHOT - + + 4.0.0 + + org.onap.policy.xacml-pdp.applications + applications + 3.0.1-SNAPSHOT + - xacml-native + xacml-native - ${project.artifactId} - This modules contains the xacml application that evaluates native policies and requests. + ${project.artifactId} + This modules contains the xacml application that evaluates native policies and requests. - - - org.onap.policy.xacml-pdp.applications - common - ${project.version} - - - org.onap.policy.xacml-pdp - xacml-test - ${project.version} - test - - + + + org.onap.policy.xacml-pdp.applications + common + ${project.version} + + + org.onap.policy.xacml-pdp + xacml-test + ${project.version} + test + + diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 45d4eb27..a24d54f0 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -20,12 +20,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.xacml-pdp.applications applications - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT xacml-optimization diff --git a/applications/pom.xml b/applications/pom.xml index e3feaa45..d56b42d9 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -3,6 +3,7 @@ ONAP ================================================================================ Copyright (C) 2019-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. @@ -18,32 +19,32 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - pom - - - org.onap.policy.xacml-pdp - policy-xacml-pdp - 3.0.0-SNAPSHOT - - - org.onap.policy.xacml-pdp.applications - applications - - - ${project.basedir}/../../target/code-coverage/jacoco-ut.exec - - - - common - guard - match - monitoring - naming - native - optimization - - + + 4.0.0 + pom + + + org.onap.policy.xacml-pdp + policy-xacml-pdp + 3.0.1-SNAPSHOT + + + org.onap.policy.xacml-pdp.applications + applications + + + ${project.basedir}/../../target/code-coverage/jacoco-ut.exec + + + + common + guard + match + monitoring + naming + native + optimization + -- cgit 1.2.3-korg