From e127e495bd8e67807d1434509e3d72882cdd0961 Mon Sep 17 00:00:00 2001
From: Ganesh T <gtiwari333@gmail.com>
Date: Sat, 3 Feb 2024 17:05:27 -0600
Subject: [PATCH] upgrade to spring boot 3.2.2 + cleanup
---
.../src/test/resources/application.yml | 2 +-
pom.xml | 48 +++++++++----------
.../main/resources/application-default.yml | 3 --
.../src/main/resources/application-dev.yml | 6 ---
.../src/main/resources/application.yml | 11 -----
.../src/main/resources/application.yml | 2 +-
6 files changed, 26 insertions(+), 46 deletions(-)
delete mode 100644 trend/trend-service-api/src/main/resources/application-default.yml
delete mode 100644 trend/trend-service-api/src/main/resources/application-dev.yml
delete mode 100644 trend/trend-service-api/src/main/resources/application.yml
diff --git a/main-app/main-webapp/src/test/resources/application.yml b/main-app/main-webapp/src/test/resources/application.yml
index ad627a9..f06ea4c 100644
--- a/main-app/main-webapp/src/test/resources/application.yml
+++ b/main-app/main-webapp/src/test/resources/application.yml
@@ -9,7 +9,7 @@ spring:
datasource:
url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=MYSQL
jpa:
- show-sql: false
+ show-sql: true
open-in-view: false
hibernate:
ddl-auto: none # we use liquibase
diff --git a/pom.xml b/pom.xml
index bd4666d..60c3e02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -30,7 +30,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <spring-boot.version>3.2.1</spring-boot.version>
+ <spring-boot.version>3.2.2</spring-boot.version>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<hibernate-types60.version>2.21.1</hibernate-types60.version>
<hibernate-hypersistence-utils.version>3.6.1</hibernate-hypersistence-utils.version>
@@ -39,13 +39,13 @@
<springdoc-openapi-ui.version>2.3.0</springdoc-openapi-ui.version>
<mapstruct.version>1.6.0.Beta1</mapstruct.version>
- <selenide.version>7.0.4</selenide.version>
+ <selenide.version>7.0.6</selenide.version>
<google-guava.version>33.0.0-jre</google-guava.version>
<wro4j.version>1.9.0</wro4j.version>
<archunit.version>1.2.1</archunit.version>
<testcontainers-keycloak.version>3.2.0</testcontainers-keycloak.version>
- <testcontainers.version>1.19.3</testcontainers.version>
+ <testcontainers.version>1.19.4</testcontainers.version>
<commons-io.version>2.15.1</commons-io.version>
<webjar-jquery.version>3.6.1</webjar-jquery.version>
<webjar-bootstrap.version>5.0.1</webjar-bootstrap.version>
@@ -330,24 +330,24 @@
</plugins>
</pluginManagement>
</build>
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+<!-- <repositories>-->
+<!-- <repository>-->
+<!-- <id>spring-milestones</id>-->
+<!-- <name>Spring Milestones</name>-->
+<!-- <url>https://repo.spring.io/milestone</url>-->
+<!-- <snapshots>-->
+<!-- <enabled>false</enabled>-->
+<!-- </snapshots>-->
+<!-- </repository>-->
+<!-- </repositories>-->
+<!-- <pluginRepositories>-->
+<!-- <pluginRepository>-->
+<!-- <id>spring-milestones</id>-->
+<!-- <name>Spring Milestones</name>-->
+<!-- <url>https://repo.spring.io/milestone</url>-->
+<!-- <snapshots>-->
+<!-- <enabled>false</enabled>-->
+<!-- </snapshots>-->
+<!-- </pluginRepository>-->
+<!-- </pluginRepositories>-->
</project>
diff --git a/trend/trend-service-api/src/main/resources/application-default.yml b/trend/trend-service-api/src/main/resources/application-default.yml
deleted file mode 100644
index 0a6f272..0000000
--- a/trend/trend-service-api/src/main/resources/application-default.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
- profiles:
- active: dev
diff --git a/trend/trend-service-api/src/main/resources/application-dev.yml b/trend/trend-service-api/src/main/resources/application-dev.yml
deleted file mode 100644
index 48d619e..0000000
--- a/trend/trend-service-api/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-spring:
- artemis:
- user: ${ACTIVEMQ_ARTEMIS_USER:admin}
- password: ${ACTIVEMQ_ARTEMIS_PASSWORD:admin}
- broker-url: tcp://${ACTIVEMQ_ARTEMIS_HOST:localhost}:${ACTIVEMQ_ARTEMIS_PORT:61616}
-
diff --git a/trend/trend-service-api/src/main/resources/application.yml b/trend/trend-service-api/src/main/resources/application.yml
deleted file mode 100644
index dbe7906..0000000
--- a/trend/trend-service-api/src/main/resources/application.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-spring:
- application:
- name: Trend-Service
- profiles:
- # The commented value for `active` can be replaced with valid spring profiles to load.
- # Otherwise, it will be filled in by maven when building the WAR file
- # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
- active: '@spring.profiles.active@'
-
-server:
- port: 8083
diff --git a/trend/trend-service/src/main/resources/application.yml b/trend/trend-service/src/main/resources/application.yml
index d6f2612..229a716 100644
--- a/trend/trend-service/src/main/resources/application.yml
+++ b/trend/trend-service/src/main/resources/application.yml
@@ -8,7 +8,7 @@ spring:
active: '@spring.profiles.active@'
server:
- port: 8083
+ port: 8084
logging:
level:
org.springframework.web: INFO