From 3e3da0a59d39f3712634aef9ce1f78d7744dfdcf Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@gmail.com>
Date: Sun, 10 Sep 2023 17:08:21 +0000
Subject: [PATCH] upgrade key services to spring boot 3.2.0

---
 .github/workflows/catalog-service.yml                     | 2 +-
 .gitpod.Dockerfile                                        | 4 ++--
 api-gateway/pom.xml                                       | 4 ++--
 catalog-service/pom.xml                                   | 2 +-
 .../src/main/resources/config-repository/application.yml  | 8 +++++---
 inventory-service/pom.xml                                 | 4 ++--
 payment-service/pom.xml                                   | 4 ++--
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/catalog-service.yml b/.github/workflows/catalog-service.yml
index 77e8f24e..5d59ee4f 100644
--- a/.github/workflows/catalog-service.yml
+++ b/.github/workflows/catalog-service.yml
@@ -52,4 +52,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           DOCKER_PASSCODE: ${{secrets.DOCKER_PASSCODE}}
-        run: ./mvnw spring-boot:build-image -DskipTests -DCI_DOCKER_PASSWORD=${DOCKER_PASSCODE} -DCI_DOCKER_USERNAME=dockertmt -Dspring-boot.build-image.publish=true
+        run: ./mvnw spring-boot:build-image -DskipTests -DCI_DOCKER_PASSWORD=${DOCKER_PASSCODE} -DCI_DOCKER_USERNAME=dockertmt
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 29deee9c..e60fe059 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -3,5 +3,5 @@ FROM gitpod/workspace-full
 USER root
 
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
-             && sdk install java 21.ea.35-open \
-             && sdk default java 21.ea.35-open"
\ No newline at end of file
+             && sdk install java 20.0.2-graal \
+             && sdk default java 20.0.2-graal"
\ No newline at end of file
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
index b1f9017c..48892db0 100644
--- a/api-gateway/pom.xml
+++ b/api-gateway/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.0-M1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.microservices</groupId>
@@ -17,7 +17,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-cloud.version>2023.0.0-M1</spring-cloud.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
diff --git a/catalog-service/pom.xml b/catalog-service/pom.xml
index 6746d0e3..8017c0d4 100644
--- a/catalog-service/pom.xml
+++ b/catalog-service/pom.xml
@@ -263,6 +263,7 @@
                 <configuration>
                     <image>
                         <name>dockertmt/mmv2-${project.artifactId}:${project.version}</name>
+                        <publish>true</publish>
                     </image>
                     <excludes>
                         <exclude>
@@ -270,7 +271,6 @@
                             <artifactId>lombok</artifactId>
                         </exclude>
                     </excludes>
-                    <pullPolicy>IF_NOT_PRESENT</pullPolicy>
                     <docker>
                         <publishRegistry>
                             <username>${CI_DOCKER_USERNAME}</username>
diff --git a/config-server/src/main/resources/config-repository/application.yml b/config-server/src/main/resources/config-repository/application.yml
index 6897b93a..fce5e153 100644
--- a/config-server/src/main/resources/config-repository/application.yml
+++ b/config-server/src/main/resources/config-repository/application.yml
@@ -25,12 +25,14 @@ jdbc:
 # traceID and spanId are predefined MDC keys - we want the logs to include them
 logging:
   pattern:
-    level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"
+    correlation: [${spring.application.name:},%X{traceId:-},%X{spanId:-}]
+  include-application-name: false
   level:
-    sql: INFO
-    web: INFO
     datasource-query-logger: INFO
 management:
+  observations:
+    key-values:
+      application: ${spring.application.name}
   # For Exemplars to work we need histogram buckets
   metrics:
     distribution:
diff --git a/inventory-service/pom.xml b/inventory-service/pom.xml
index ed9b9572..ca170520 100644
--- a/inventory-service/pom.xml
+++ b/inventory-service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.0-M1</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.inventoryservice</groupId>
@@ -20,7 +20,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>17</java.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-cloud.version>2023.0.0-M1</spring-cloud.version>
         <commons-io.version>2.13.0</commons-io.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
 
diff --git a/payment-service/pom.xml b/payment-service/pom.xml
index 52f56f72..21a439fa 100644
--- a/payment-service/pom.xml
+++ b/payment-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.0-M1</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.paymentservice</groupId>
@@ -19,7 +19,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>17</java.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-cloud.version>2023.0.0-M1</spring-cloud.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
         <commons-io.version>2.13.0</commons-io.version>
         <problem-spring-web.version>0.29.1</problem-spring-web.version>