From fc19178b956f4474ed14e810fd911ac60f3756d0 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 30 Aug 2023 14:57:10 +0100
Subject: Upgrade Java 17 in policy-drools-apps

Issue-ID: POLICY-4816
Change-Id: I61d5c2c0b8bf2cc08416d91bbd84f27f2ed5c5c1
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 .../ophistory/OperationHistoryDataManagerImpl.java         | 14 +++++++-------
 .../src/main/resources/META-INF/persistence.xml            |  8 ++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'controlloop/common/eventmanager/src/main')

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
index c36ca786d..36d0ba59c 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
@@ -21,15 +21,15 @@
 
 package org.onap.policy.controlloop.ophistory;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Consumer;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -312,10 +312,10 @@ public class OperationHistoryDataManagerImpl implements OperationHistoryDataMana
      */
     private Properties toProperties(OperationHistoryDataManagerParams params) {
         var props = new Properties();
-        props.put("javax.persistence.jdbc.driver",   params.getDriver());
-        props.put("javax.persistence.jdbc.url",      params.getUrl());
-        props.put("javax.persistence.jdbc.user",     params.getUserName());
-        props.put("javax.persistence.jdbc.password", params.getPassword());
+        props.put("jakarta.persistence.jdbc.driver",   params.getDriver());
+        props.put("jakarta.persistence.jdbc.url",      params.getUrl());
+        props.put("jakarta.persistence.jdbc.user",     params.getUserName());
+        props.put("jakarta.persistence.jdbc.password", params.getPassword());
         props.put("hibernate.dialect",               params.getDbHibernateDialect());
 
         return props;
diff --git a/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml b/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
index 115ec51ae..e55fda222 100644
--- a/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
+++ b/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
@@ -19,13 +19,17 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
 
     <persistence-unit name="OperationsHistoryPU" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <class>org.onap.policy.guard.OperationsHistory</class>
 
         <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="create" />
+            <property name="jakarta.persistence.schema-generation.database.action" value="create" />
             <property name="hibernate.dialect" value="org.hibernate.dialect.MariaDBDialect" />
             <property name="hibernate.show_sql" value="false" />
         </properties>
-- 
cgit 1.2.3-korg