diff options
author | adheli.tavares <adheli.tavares@est.tech> | 2024-08-01 13:50:52 +0100 |
---|---|---|
committer | adheli.tavares <adheli.tavares@est.tech> | 2024-08-01 13:52:09 +0100 |
commit | a029ccab07f2dd71286804da620c513da9fdfc0e (patch) | |
tree | 64e31fd4157120a8aee87a84c2481c825b4ac221 /models-dao | |
parent | d6e6d390f583fa860e98f8e4e2b71dac2a6604aa (diff) |
Fix on persistence.xml after updating hibernate dependencies
- fix on side effects from drools-apps fix.
- hibernate does not allow class annotated with @MappedSuperClass
to have also @Table annotation.
Issue-ID: POLICY-4955
Change-Id: I1493f58cd31646842220872c239629f3a499a9f3
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'models-dao')
-rw-r--r-- | models-dao/pom.xml | 8 | ||||
-rw-r--r-- | models-dao/src/test/resources/META-INF/persistence.xml | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/models-dao/pom.xml b/models-dao/pom.xml index f10f6115a..1a3371530 100644 --- a/models-dao/pom.xml +++ b/models-dao/pom.xml @@ -51,12 +51,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-jakarta</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate.validator</groupId> - <artifactId>hibernate-validator</artifactId> + <groupId>org.hibernate.orm</groupId> + <artifactId>hibernate-core</artifactId> </dependency> </dependencies> </project> diff --git a/models-dao/src/test/resources/META-INF/persistence.xml b/models-dao/src/test/resources/META-INF/persistence.xml index f4c689cd6..8dd818f16 100644 --- a/models-dao/src/test/resources/META-INF/persistence.xml +++ b/models-dao/src/test/resources/META-INF/persistence.xml @@ -19,7 +19,9 @@ ============LICENSE_END========================================================= --> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0"> +<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="DaoTest" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider> <class>org.onap.policy.models.dao.converters.CDataConditioner</class> @@ -32,8 +34,8 @@ <class>org.onap.policy.models.dao.DummyReferenceTimestampEntity</class> <properties> - <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" /> - <property name="hibernate.show_sql" value="false" /> + <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/> + <property name="hibernate.show_sql" value="false"/> </properties> </persistence-unit> </persistence> |