aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToine Siebelink <toine.siebelink@est.tech>2023-09-28 07:31:07 +0000
committerGerrit Code Review <gerrit@onap.org>2023-09-28 07:31:07 +0000
commitfcc18eafdb851174cef21e078a118a3e91a73340 (patch)
treec227874534b8cebcd04bf48d529b35c2fcc76cdc
parent4e91e54dffc9a0d1dd154bd97b25162921fd9d11 (diff)
parent186b901e3dd7e54a502edb328ec9e84c1fd3af4a (diff)
Merge "Uplift Spring Boot to 3.1.2"
-rw-r--r--cps-application/src/main/resources/application.yml5
-rwxr-xr-xcps-dependencies/pom.xml6
-rwxr-xr-xcps-parent/pom.xml2
-rw-r--r--cps-ri/src/main/resources/hibernate.cfg.xml2
-rw-r--r--integration-test/src/test/resources/hibernate.cfg.xml2
5 files changed, 8 insertions, 9 deletions
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 016356801..7beab2e7c 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -37,9 +37,8 @@ spring:
ddl-auto: create
open-in-view: false
properties:
- hibernate:
- enable_lazy_load_no_trans: true
- dialect: org.hibernate.dialect.PostgreSQLDialect
+ hibernate.enable_lazy_load_no_trans: true
+ hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
datasource:
url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 16f76b91d..f6931c302 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>3.0.0</version>
+ <version>3.1.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -104,7 +104,7 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
+ <version>3.1.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -259,7 +259,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.14.0</version>
+ <version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 248bc28cb..41215567c 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.2</version>
<executions>
<execution>
<goals>
diff --git a/cps-ri/src/main/resources/hibernate.cfg.xml b/cps-ri/src/main/resources/hibernate.cfg.xml
index 98e6cfc5b..1b822b9de 100644
--- a/cps-ri/src/main/resources/hibernate.cfg.xml
+++ b/cps-ri/src/main/resources/hibernate.cfg.xml
@@ -9,7 +9,7 @@
<property name="hibernate.connection.url">jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb</property>
<property name="hibernate.connection.username">${DB_USERNAME}</property>
<property name="hibernate.connection.password">${DB_PASSWORD}</property>
- <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<property name="show_sql">true</property>
<property name="hibernate.hbm2ddl.auto">update</property>
</session-factory>
diff --git a/integration-test/src/test/resources/hibernate.cfg.xml b/integration-test/src/test/resources/hibernate.cfg.xml
index 513c00ad2..8d5139b60 100644
--- a/integration-test/src/test/resources/hibernate.cfg.xml
+++ b/integration-test/src/test/resources/hibernate.cfg.xml
@@ -9,7 +9,7 @@
<property name="hibernate.connection.url">${DB_URL}</property>
<property name="hibernate.connection.username">${DB_USERNAME}</property>
<property name="hibernate.connection.password">${DB_PASSWORD}</property>
- <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<property name="show_sql">true</property>
<property name="hibernate.hbm2ddl.auto">none</property>
</session-factory>