upgrade to spring boot 3.2.2 (#16)

* upgrade to spring boot 3.2.2
gtiwari333 · Feb 4, 2024 · effb47f · effb47f
1 parent b28a761
commit effb47f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 50 deletions.
diff --git a/main-app/main-orm/src/main/java/gt/app/domain/Comment.java b/main-app/main-orm/src/main/java/gt/app/domain/Comment.java
@@ -3,7 +3,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
 import lombok.Data;
 
 import java.util.Objects;
@@ -16,10 +15,8 @@ public class Comment extends BaseAuditingEntity {
     @Enumerated(EnumType.STRING)
     private CommentStatus status = CommentStatus.AWAITING_APPROVAL;
 
-    @JoinColumn(nullable = false)
     private Long articleId;
 
-    @JoinColumn(nullable = true)
     private Long parentCommentId;
 
     public Comment() {

diff --git a/main-app/main-webapp/src/main/java/gt/app/modules/article/CommentRepository.java b/main-app/main-webapp/src/main/java/gt/app/modules/article/CommentRepository.java
@@ -31,6 +31,6 @@ public interface CommentRepository extends AbstractRepository<Comment>, CommentR
     void deleteByArticleId(Long id);
 
     @Override
-    @CacheEvict(cacheNames = {"articleRead"}, key = "#c.articleId")
+    @CacheEvict(cacheNames = {"articleRead"}, key = "#result.articleId")
     Comment save(Comment c);
 }
diff --git 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
@@ -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
diff --git a/trend/trend-service-api/src/main/resources/application-dev.yml b/trend/trend-service-api/src/main/resources/application-dev.yml
diff --git a/trend/trend-service-api/src/main/resources/application.yml b/trend/trend-service-api/src/main/resources/application.yml
diff --git 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