Upgrade Spring Boot 4/JDK 25 - build person-service

Author: rodrigorodrigues

docker/docker-compose.yml

@@ -220,9 +220,10 @@ services:
 
   person-api:
     image: person-service:0.0.1-SNAPSHOT
+#    image: fielcapao/microservices-design-patterns-person-service:latest
     container_name: person-api
     environment:
-      - SPRING_PROFILES_ACTIVE=consul,prod #,kafka,callPostApi
+      - SPRING_PROFILES_ACTIVE=consul,dev #,kafka,callPostApi
       - CONSUL_URL=service-discovery:8500
       - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SERVER_PORT=8082
@@ -242,6 +243,11 @@ services:
 #      - com.microservice.authentication.jwt.publicKeyStore=file:/www.spendingbetter.com.pub
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${CERT_PASSWORD}
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
+      - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017/docker
+      - SPRING_MONGODB_HOST=mongodb-datasource
+      - SPRING_MONGODB_DATABASE=docker
+      - SPRING_AUTOCONFIGURE_EXCLUDE_0=org.springdoc.core.configuration.SpringDocConfiguration
+      - SPRING_CLOUD_CONSUL_HOST=service-discovery
     depends_on:
       - service-discovery
       - mongodb-datasource
@@ -384,6 +390,7 @@ services:
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017/docker
       - SPRING_MONGODB_HOST=mongodb-datasource
       - SPRING_MONGODB_DATABASE=docker
+      - SPRING_AUTOCONFIGURE_EXCLUDE_0=org.springdoc.core.configuration.SpringDocConfiguration
       - SPRING_DATA_MONGODB_DATABASE=docker
       - SPRING_MAIN_ALLOW_CIRCULAR_REFERENCES=true
       - COM_MICROSERVICE_AUTHENTICATION_REDIS_ENABLED=true
@@ -409,7 +416,6 @@ services:
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
       - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI=http://localhost:9999/.well-known/jwks.json
       - OTEL_SDK_DISABLED=true
-      - SPRING_AUTOCONFIGURE_EXCLUDE_0=org.springdoc.core.configuration.SpringDocConfiguration
 #      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=debug
 #      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
 #      - OTEL_JAVAAGENT_DEBUG=false

person-service/pom.xml

@@ -7,31 +7,22 @@
         <artifactId>microservice</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>com.springboot</groupId>
     <artifactId>person-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
     <name>person-service</name>
     <description>Spring Boot - Person Service</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <code-coverage>0.7</code-coverage>
-        <docker.image-tag>${project.version}</docker.image-tag>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-json</artifactId>
-            <version>4.0.0-M3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jackson</artifactId>
-            <version>4.0.0-M3</version>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+            <version>${lombok.version}</version>
         </dependency>
 
         <dependency>
@@ -104,13 +95,6 @@
             <artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-            <version>${lombok.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.springboot</groupId>
             <artifactId>web-common</artifactId>
@@ -201,11 +185,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-testcontainers</artifactId>
@@ -242,7 +221,7 @@
                                 <from>${docker.image.from.fabric8}</from>
                                 <tags>
                                     <tag>latest</tag>
-                                    <tag>${docker.image-tag}</tag>
+                                    <tag>${project.version}</tag>
                                 </tags>
                                 <assembly>
                                     <descriptorRef>artifact</descriptorRef>
@@ -307,6 +286,19 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                            <goal>build-info</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
     </build>
 </project>

person-service/src/main/resources/application.yml

@@ -24,7 +24,25 @@ management:
 logging:
     pattern:
         level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-},requestId=%X{requestId:-}]"
+---
+spring:
+    config:
+        activate:
+            on-profile: ssl
 
+    ssl:
+        bundle:
+            jks:
+                web-server:
+                    key:
+                        alias: ${SSL_KEY_ALIAS}
+                    keystore:
+                        location: ${SSL_KEYSTORE_LOCATION}
+                        password: ${SSL_KEYSTORE_PASSWORD}
+server:
+    ssl:
+        bundle: "web-server"
+        client-auth: NONE
 ---
 spring:
     config:

user-service/pom.xml

@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <version>5.0.0</version>
+			<version>5.1.0</version>
         </dependency>
 
         <dependency>