aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradheli.tavares <adheli.tavares@est.tech>2024-02-20 14:35:10 +0000
committeradheli.tavares <adheli.tavares@est.tech>2024-02-20 14:37:53 +0000
commitb824255ebe9336063b70be668a56995beb1d972f (patch)
treea68530e79827288e5842d1b7b01042beddace765
parente7970814335ef4ec3cbf9f01c84684330f03d9ab (diff)
Fix config files to remove outdated hibernate configuration
Issue-ID: POLICY-4929 Change-Id: I218b6f0bc095d2693f8fa278a255dac0ad145588 Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
-rw-r--r--.gitignore1
-rw-r--r--main/pom.xml1
-rw-r--r--main/src/main/resources/application.yaml3
-rw-r--r--main/src/test/resources/META-INF/persistence.xml2
-rw-r--r--main/src/test/resources/application-test.yaml4
-rw-r--r--packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml7
6 files changed, 6 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 8daeb28f..89ec75f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ debug-logs/
*.iml
*.ipr
*.iws
+**/*.log
diff --git a/main/pom.xml b/main/pom.xml
index 9627bed9..b37a1c5a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -162,7 +162,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${version.springboot}</version>
<executions>
<execution>
<goals>
diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml
index 32b1c9ca..8bec86ec 100644
--- a/main/src/main/resources/application.yaml
+++ b/main/src/main/resources/application.yaml
@@ -11,9 +11,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
diff --git a/main/src/test/resources/META-INF/persistence.xml b/main/src/test/resources/META-INF/persistence.xml
index f73f7d05..9b988cb5 100644
--- a/main/src/test/resources/META-INF/persistence.xml
+++ b/main/src/test/resources/META-INF/persistence.xml
@@ -23,7 +23,7 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
<persistence-unit name="ToscaConceptTest" transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.onap.policy.models.base.PfConceptKey</class>
<class>org.onap.policy.models.dao.converters.CDataConditioner</class>
diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml
index f47873b7..329d96be 100644
--- a/main/src/test/resources/application-test.yaml
+++ b/main/src/test/resources/application-test.yaml
@@ -3,11 +3,9 @@ spring:
url: jdbc:h2:mem:testdb
driverClassName: org.h2.Driver
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.H2Dialect
hibernate:
ddl-auto: update
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
+ open-in-view: false \ No newline at end of file
diff --git a/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml b/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml
index 2c19199a..704dd640 100644
--- a/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml
+++ b/packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml
@@ -12,9 +12,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
@@ -67,4 +64,6 @@ management:
base-path: /
exposure:
include: health,metrics,prometheus
- path-mapping.prometheus: metrics
+ path-mapping:
+ -metrics: plain-metrics
+ -prometheus: metrics