summaryrefslogtreecommitdiffstats
path: root/models-pdp
diff options
context:
space:
mode:
authoradheli.tavares <adheli.tavares@est.tech>2024-02-20 14:33:26 +0000
committeradheli.tavares <adheli.tavares@est.tech>2024-02-21 11:00:35 +0000
commit389c85c8e7213c10c17896f4c63d94e2b5e9d27a (patch)
tree1a54214282acaa444c9ce36b5cf8dc7310296640 /models-pdp
parent107b75a2b584222f7d5dcdbec64063c036b4f2b2 (diff)
Fix config files to remove outdated configuration for hibernate
Issue-ID: POLICY-4929 Change-Id: Icd796030753c505c99c1840d8d11fb2f8300c15e Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'models-pdp')
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java14
-rw-r--r--models-pdp/src/test/resources/META-INF/persistence.xml5
2 files changed, 9 insertions, 10 deletions
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
index 620b8184c..4c6a46142 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021,2023 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2023 Bell Canada. All rights reserved.
* ================================================================================
@@ -93,15 +93,15 @@ public class PdpProviderTest {
daoParameters.setPersistenceUnit("ToscaConceptTest");
Properties jdbcProperties = new Properties();
- jdbcProperties.setProperty("javax.persistence.jdbc.user", "policy");
- jdbcProperties.setProperty("javax.persistence.jdbc.password", "P01icY");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("javax.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("javax.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
} else {
- jdbcProperties.setProperty("javax.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("javax.persistence.jdbc.url", "jdbc:h2:mem:PdpProviderTest");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:PdpProviderTest");
}
daoParameters.setJdbcProperties(jdbcProperties);
diff --git a/models-pdp/src/test/resources/META-INF/persistence.xml b/models-pdp/src/test/resources/META-INF/persistence.xml
index 4cc71ec1a..8e15613c8 100644
--- a/models-pdp/src/test/resources/META-INF/persistence.xml
+++ b/models-pdp/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- Copyright (C) 2019,2021,2023 Nordix Foundation.
+ Copyright (C) 2019, 2021, 2023-2024 Nordix Foundation.
Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
Modifications Copyright (C) 2023 Bell Canada. All rights reserved.
================================================================================
@@ -36,8 +36,7 @@
<class>org.onap.policy.models.tosca.simple.concepts.JpaToscaProperty</class>
<properties>
- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />
- <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+ <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
<property name="hibernate.show_sql" value="false" />
</properties>
</persistence-unit>