From 34cad0af615db1ed4b85b8e4e1b77d0948289eed Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 1 Aug 2024 13:46:11 +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: Ie2f2083122d2cdb64a60120ffa83f1a2bc961c34
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 integrity-audit/pom.xml                                    |  4 ++--
 .../src/main/resources/META-INF/persistence.xml            | 14 +++++++-------
 integrity-monitor/pom.xml                                  |  4 ++--
 .../src/main/resources/META-INF/persistence.xml            | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml
index ed75aa58..f2cd6f0e 100644
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -57,8 +57,8 @@
             <artifactId>lombok</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core-jakarta</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integrity-audit/src/main/resources/META-INF/persistence.xml b/integrity-audit/src/main/resources/META-INF/persistence.xml
index 63fea7b1..1d72eeba 100644
--- a/integrity-audit/src/main/resources/META-INF/persistence.xml
+++ b/integrity-audit/src/main/resources/META-INF/persistence.xml
@@ -4,7 +4,7 @@
   Integrity Audit
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2023 Nordix Foundation.
+  Modifications Copyright (C) 2023-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
   ============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 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="testPU" transaction-type="RESOURCE_LOCAL">
         <!-- Limited use for generating the DB and schema files for iatest DB - uses hibernate -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
@@ -30,8 +30,8 @@
         <class>org.onap.policy.common.ia.jpa.IaTestEntity</class>
         <shared-cache-mode>NONE</shared-cache-mode>
         <properties>
-            <property name="jakarta.persistence.schema-generation.database.action" value="create" />
-            <property name="hibernate.show_sql" value="false" />
+            <property name="jakarta.persistence.schema-generation.database.action" value="create"/>
+            <property name="hibernate.show_sql" value="false"/>
         </properties>
     </persistence-unit>
 
@@ -41,7 +41,7 @@
         <class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>
         <shared-cache-mode>NONE</shared-cache-mode>
         <properties>
-            <property name="hibernate.show_sql" value="false" />
+            <property name="hibernate.show_sql" value="false"/>
         </properties>
     </persistence-unit>
 </persistence>
diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index e48a2983..442566fb 100644
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -48,8 +48,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core-jakarta</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integrity-monitor/src/main/resources/META-INF/persistence.xml b/integrity-monitor/src/main/resources/META-INF/persistence.xml
index ecba25cc..6a46c2a2 100644
--- a/integrity-monitor/src/main/resources/META-INF/persistence.xml
+++ b/integrity-monitor/src/main/resources/META-INF/persistence.xml
@@ -20,11 +20,11 @@
   ============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 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="schemaPU" transaction-type="RESOURCE_LOCAL">
-    <!-- Limited use for generating the DB and schema files for imtest DB - uses hibernate -->
+        <!-- Limited use for generating the DB and schema files for imtest DB - uses hibernate -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
         <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
@@ -32,12 +32,12 @@
         <class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
         <shared-cache-mode>NONE</shared-cache-mode>
         <properties>
-            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
     </persistence-unit>
 
     <persistence-unit name="operationalPU" transaction-type="RESOURCE_LOCAL">
-    <!-- For operational use -->
+        <!-- For operational use -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
         <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
-- 
2.16.6