From bba8860e84b9745970152769345ae617479d888c Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 1 Aug 2024 13:53:31 +0100
Subject: [PATCH] Fix on persistence.xml after updating hibernate dependencies

- fix on side effects from drools-apps fix.

Issue-ID: POLICY-4955
Change-Id: I6129924b891539ca67ac16627ca9d8e4f0775202
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 main/pom.xml                                     |  4 ++--
 main/src/main/resources/META-INF/persistence.xml | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 59f52321..fbb7ba34 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -69,8 +69,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core-jakarta</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/main/src/main/resources/META-INF/persistence.xml b/main/src/main/resources/META-INF/persistence.xml
index 93eafbe3..a96c2c34 100644
--- a/main/src/main/resources/META-INF/persistence.xml
+++ b/main/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
+   Copyright (C) 2019-2020, 2022-2024 Nordix Foundation.
    Modifications Copyright (C) 2021 AT&T Intellectual Property.
    Modifications Copyright (C) 2023 Bell Canada. All rights reserved.
   ================================================================================
@@ -21,12 +21,10 @@
   ============LICENSE_END=========================================================
 -->
 
-<persistence
-    xmlns="http://java.sun.com/xml/ns/persistence"
-    version="2.0">
-    <persistence-unit
-        name="PolicyDb"
-        transaction-type="RESOURCE_LOCAL">
+<persistence version="3.1" 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_1.xsd">
+    <persistence-unit name="PolicyDb" transaction-type="RESOURCE_LOCAL">
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 
         <class>org.onap.policy.models.base.PfConceptKey</class>
@@ -61,9 +59,9 @@
         <class>org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger</class>
 
         <properties>
-            <property name="jakarta.persistence.schema-generation.database.action" value="none" />
-            <property name="hibernate.hbm2ddl.auto" value="validate" />
-            <property name="eclipselink.logging.level" value="WARNING" />
+            <property name="jakarta.persistence.schema-generation.database.action" value="none"/>
+            <property name="hibernate.hbm2ddl.auto" value="validate"/>
+            <property name="eclipselink.logging.level" value="WARNING"/>
         </properties>
     </persistence-unit>
 </persistence>
-- 
2.16.6