spring boot 3.5 upgrade

gtiwari333 · gtiwari333 · commit 9f60ccc5af48 · 2025-12-13T18:21:10.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
+application-default.yml
 
 ### STS ###
 .apt_generated
diff --git a/common/src/main/java/gt/common/config/ReqLogFilter.java b/common/src/main/java/gt/common/config/ReqLogFilter.java
@@ -21,8 +21,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 
             req.put("req.remoteHost", request.getRemoteHost());
 
-            if (request instanceof HttpServletRequest) {
-                HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+            if (request instanceof HttpServletRequest httpServletRequest) {
                 req.put("req.requestURI", httpServletRequest.getRequestURI());
                 StringBuffer requestURL = httpServletRequest.getRequestURL();
                 if (requestURL != null) {
diff --git a/common/src/main/java/gt/common/dtos/ArticleSummaryDto.java b/common/src/main/java/gt/common/dtos/ArticleSummaryDto.java
@@ -4,13 +4,15 @@
 import lombok.Setter;
 import lombok.ToString;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 @Getter
 @Setter
 @ToString
 public class ArticleSummaryDto implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -1007949715L;
 
     private Long id;
diff --git a/content-checker/content-checker-service/pom.xml b/content-checker/content-checker-service/pom.xml
@@ -57,6 +57,12 @@
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc-openapi-ui.version}</version>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -98,24 +104,5 @@
         </plugins>
     </build>
 
-    <profiles>
-
-        <profile>
-            <id>local</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springdoc</groupId>
-                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-                    <version>${springdoc-openapi-ui.version}</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-            <properties>
-                <spring.profiles.active>local</spring.profiles.active>
-                <build.profile>local</build.profile>
-            </properties>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/content-checker/content-checker-service/src/main/resources/application-default.yml b/content-checker/content-checker-service/src/main/resources/application-default.yml
@@ -1,3 +0,0 @@
-spring:
-    profiles:
-        active: local
diff --git a/content-checker/content-checker-service/src/main/resources/application.yml b/content-checker/content-checker-service/src/main/resources/application.yml
@@ -1,11 +1,6 @@
 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@'
     artemis:
         user: ${ACTIVEMQ_ARTEMIS_USER:admin}
         password: ${ACTIVEMQ_ARTEMIS_PASSWORD:admin}
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
@@ -1,4 +1,5 @@
 # use this to run dependencies like activemq, email, mysql, keycloak using docker for DEVELOPMENT
+# Run using : $docker compose -f docker-compose-dev.yml up
 version: '3'
 services:
     activemq_artemis:
@@ -49,13 +50,13 @@ services:
             - "KEYCLOAK_ADMIN_PASSWORD=admin"
             - "KEYCLOAK_FEATURES=scripts"
             - "KEYCLOAK_HTTP_PORT=8080"
-            - "KEYCLOAK_HTTPS_PORT=9443"
+            - "KEYCLOAK_HTTPS_PORT=9445"
         #        entrypoint: /tmp/keycloak/config/docker-compose-entrypoint.sh --hostname host.docker.internal:8080
         volumes:
             - ../main-app/main-webapp/src/main/resources/keycloak/:/opt/keycloak/data/import
         ports:
             - 8080:8080
-            - 9443:9443
+            - 9445:9445
         networks:
             - gtapp-network
 volumes:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,3 +1,4 @@
+# this is used to build docker images
 version: '3'
 services:
     localhost: #expose all container ports so they can use services using localhost:PORT
@@ -48,14 +49,12 @@ services:
             - "KEYCLOAK_ADMIN_PASSWORD=admin"
             - "KEYCLOAK_FEATURES=scripts"
             - "KEYCLOAK_HTTP_PORT=8080"
-            - "KEYCLOAK_HTTPS_PORT=9443"
+            - "KEYCLOAK_HTTPS_PORT=9445"
         volumes:
             - ../main-app/main-webapp/src/main/resources/keycloak/:/opt/keycloak/data/import
         network_mode: "service:localhost"
     content-checker-service:
         image: gtapp-content-checker-service:latest
-        environment:
-            - "ZIPKIN_HOST=zipkin"
         network_mode: "service:localhost"
         depends_on:
             - zipkin
diff --git a/email/email-service-api/src/main/resources/application.yml b/email/email-service-api/src/main/resources/application.yml
@@ -1,11 +1,6 @@
 spring:
     application:
         name: Report 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: 8086
diff --git a/email/email-service/pom.xml b/email/email-service/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <app.version>${project.parent.version}</app.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
     </properties>
 
 
@@ -81,12 +82,10 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${testcontainers.version}</version>
         </dependency>
 
         <!-- test only dependencies -->
diff --git a/email/email-service/src/main/resources/application-default.yml b/email/email-service/src/main/resources/application-default.yml
diff --git a/email/email-service/src/main/resources/application.yml b/email/email-service/src/main/resources/application.yml
@@ -1,11 +1,6 @@
 spring:
     application:
         name: Email 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@'
     mail:
         host: ${MAILHOG_HOST:localhost}
         port: ${MAILHOG_PORT:1025}
diff --git a/main-app/main-orm-jooq/pom.xml b/main-app/main-orm-jooq/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <app.version>${project.parent.version}</app.version>
+        <spring-security.version>6.5.7</spring-security.version>
     </properties>
 
     <dependencies>
diff --git a/main-app/main-orm/pom.xml b/main-app/main-orm/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+        <spring-framework.version>6.2.15</spring-framework.version>
     </properties>
 
     <dependencies>
@@ -69,11 +70,6 @@
             <artifactId>jakarta.validation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <optional>true</optional>
-        </dependency>
 
     </dependencies>
 
diff --git a/main-app/main-webapp/pom.xml b/main-app/main-webapp/pom.xml
@@ -170,12 +170,23 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-
         <!-- end processor/code generators -->
+        <!-- development -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc-openapi-ui.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.webjars</groupId>
-            <artifactId>webjars-locator-core</artifactId>
+            <artifactId>webjars-locator-lite</artifactId>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -257,8 +268,9 @@
         <!-- query performance -->
         <dependency>
             <groupId>io.hypersistence</groupId>
-            <artifactId>hypersistence-utils-hibernate-60</artifactId>
+            <artifactId>hypersistence-utils-hibernate-63</artifactId>
             <scope>test</scope>
+            <version>3.8.3</version>
         </dependency>
         <dependency>
             <groupId>com.github.gavlyukovskiy</groupId>
@@ -479,14 +491,14 @@
                     <wroFile>${basedir}/src/main/resources/wro.xml</wroFile>
                     <extraConfigFile>${basedir}/src/main/resources/wro.properties</extraConfigFile>
                 </configuration>
-                <dependencies>
-                    <!-- For Java 11 compatibility -->
-                    <dependency>
-                        <groupId>org.mockito</groupId>
-                        <artifactId>mockito-core</artifactId>
-                        <version>${mockito.version}</version>
-                    </dependency>
-                </dependencies>
+<!--                <dependencies>-->
+<!--                    &lt;!&ndash; For Java 11 compatibility &ndash;&gt;-->
+<!--                    <dependency>-->
+<!--                        <groupId>org.mockito</groupId>-->
+<!--                        <artifactId>mockito-core</artifactId>-->
+<!--                        <version>${mockito.version}</version>-->
+<!--                    </dependency>-->
+<!--                </dependencies>-->
             </plugin>
 
             <plugin>
@@ -515,27 +527,5 @@
         </plugins>
     </build>
 
-    <profiles>
-
-        <profile>
-            <id>local</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springdoc</groupId>
-                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-                    <version>${springdoc-openapi-ui.version}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-devtools</artifactId>
-                </dependency>
-            </dependencies>
-            <properties>
-                <spring.profiles.active>local</spring.profiles.active>
-                <build.profile>local</build.profile>
-            </properties>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/main-app/main-webapp/src/main/java/gt/app/api/InternalKeycloakAuthConfig.java b/main-app/main-webapp/src/main/java/gt/app/api/InternalKeycloakAuthConfig.java
@@ -32,7 +32,7 @@ public RequestInterceptor bearerAuthRequestInterceptor() {
             }
             */
             log.info("Calling {} with token", template.url());
-            template.header(AUTHORIZATION_HEADER, String.format("%s %s", BEARER, idTokenOpt.get().getTokenValue()));
+            template.header(AUTHORIZATION_HEADER, "%s %s".formatted(BEARER, idTokenOpt.get().getTokenValue()));
         };
     }
 
diff --git a/main-app/main-webapp/src/main/java/gt/app/exception/DuplicateRecordException.java b/main-app/main-webapp/src/main/java/gt/app/exception/DuplicateRecordException.java
@@ -12,6 +12,6 @@ public DuplicateRecordException(String description) {
     }
 
     public DuplicateRecordException(String requestedObjectName, String requestedByField, Object requestedByParam) {
-        super(String.format("%s with %s = '%s' already exists", requestedObjectName, requestedByField, requestedByParam));
+        super("%s with %s = '%s' already exists".formatted(requestedObjectName, requestedByField, requestedByParam));
     }
 }
diff --git a/main-app/main-webapp/src/main/java/gt/app/exception/RecordNotFoundException.java b/main-app/main-webapp/src/main/java/gt/app/exception/RecordNotFoundException.java
@@ -12,6 +12,6 @@ public RecordNotFoundException(String description) {
     }
 
     public RecordNotFoundException(String requestedObjectName, String requestedByField, Object requestedByParam) {
-        super(String.format("%s not found with %s = '%s'", requestedObjectName, requestedByField, requestedByParam));
+        super("%s not found with %s = '%s'".formatted(requestedObjectName, requestedByField, requestedByParam));
     }
 }
diff --git a/main-app/main-webapp/src/main/java/gt/app/modules/file/FileService.java b/main-app/main-webapp/src/main/java/gt/app/modules/file/FileService.java
@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.UUID;
 
 @Service
@@ -19,7 +18,7 @@ public class FileService {
     private final Path rootLocation;
 
     public FileService(AppProperties appProperties) {
-        this.rootLocation = Paths.get(appProperties.getFileStorage().getUploadFolder());
+        this.rootLocation = Path.of(appProperties.getFileStorage().getUploadFolder());
     }
 
     public String store(ReceivedFile.FileGroup fileGroup, @NotNull MultipartFile file) {
diff --git a/main-app/main-webapp/src/main/resources/application-default.yml b/main-app/main-webapp/src/main/resources/application-default.yml
diff --git a/main-app/main-webapp/src/main/resources/application.yml b/main-app/main-webapp/src/main/resources/application.yml
@@ -3,11 +3,6 @@ spring:
         name: Main-APP
     mvc:
         static-path-pattern: /static/**
-    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@'
     jooq:
         sql-dialect: MySQL
     liquibase:
diff --git a/main-app/report-service/pom.xml b/main-app/report-service/pom.xml
@@ -64,6 +64,12 @@
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc-openapi-ui.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
@@ -108,24 +114,5 @@
         </plugins>
     </build>
 
-    <profiles>
-
-        <profile>
-            <id>local</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springdoc</groupId>
-                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-                    <version>${springdoc-openapi-ui.version}</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-            <properties>
-                <spring.profiles.active>local</spring.profiles.active>
-                <build.profile>local</build.profile>
-            </properties>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/main-app/report-service/src/main/resources/application.yml b/main-app/report-service/src/main/resources/application.yml
diff --git a/pom.xml b/pom.xml
diff --git a/trend/trend-service/pom.xml b/trend/trend-service/pom.xml
diff --git a/trend/trend-service/src/main/resources/application-default.yml b/trend/trend-service/src/main/resources/application-default.yml
diff --git a/trend/trend-service/src/main/resources/application.yml b/trend/trend-service/src/main/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-spring:`
`2`		`- profiles:`
`3`		`- active: local`