Merge pull request #49 from Azure/gk/svc-updates

bump all deps
Azure · Jun 18, 2024 · d10c53a · d10c53a
2 parents 230c50f + 4578cf3
commit d10c53a
Show file tree

Hide file tree

Showing 29 changed files with 247 additions and 230 deletions.
diff --git a/accounting-service/pom.xml b/accounting-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.9</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.microsoft.gbb.reddog</groupId>
@@ -15,10 +15,10 @@
     <description>accounting-service</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud-azure.version>4.7.0</spring-cloud-azure.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
-        <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
-        <azure.spring.data.cosmos.version>3.33.0</azure.spring.data.cosmos.version>
+        <spring-cloud-azure.version>5.13.0</spring-cloud-azure.version>
+        <spring-cloud.version>2023.0.2</spring-cloud.version>
+        <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+        <azure.spring.data.cosmos.version>5.13.0</azure.spring.data.cosmos.version>
         <flyway-maven-plugin.version>9.3.0</flyway-maven-plugin.version>
     </properties>
     <dependencies>
@@ -89,6 +89,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
+            <version>3.1.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -177,7 +178,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.24</version>
+                            <version>1.18.32</version>
                         </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -190,7 +191,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.7.0</version>
                 <executions>
                     <execution>
                         <id>copy-agent</id>
@@ -205,7 +206,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.azure</groupId>
                             <artifactId>applicationinsights-agent</artifactId>
-                            <version>3.4.6</version>
+                            <version>3.5.3</version>
                             <outputDirectory>${project.build.directory}/agent</outputDirectory>
                             <destFileName>applicationinsights-agent.jar</destFileName>
                         </artifactItem>

diff --git a/...rc/main/java/com/microsoft/gbb/reddog/accountingservice/AccountingServiceApplication.java b/...rc/main/java/com/microsoft/gbb/reddog/accountingservice/AccountingServiceApplication.java
@@ -3,12 +3,12 @@
 import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.kafka.annotation.EnableKafka;
 
 @EnableKafka
 @SpringBootApplication
-@EnableEurekaClient
+@EnableDiscoveryClient
 @EnableCosmosRepositories
 public class AccountingServiceApplication {
 

diff --git a/ancillary/local-config-service/pom.xml b/ancillary/local-config-service/pom.xml
@@ -15,7 +15,7 @@
 	<description>local-config-service</description>
 	<properties>
 		<java.version>17</java.version>
-		<spring-cloud.version>2021.0.5</spring-cloud.version>
+		<spring-cloud.version>2023.0.2</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/ancillary/local-eureka-server/pom.xml b/ancillary/local-eureka-server/pom.xml
@@ -15,7 +15,7 @@
 	<description>local-eureka-server</description>
 	<properties>
 		<java.version>17</java.version>
-		<spring-cloud.version>2021.0.5</spring-cloud.version>
+		<spring-cloud.version>2023.0.2</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/ancillary/local-gateway/pom.xml b/ancillary/local-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.9</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.microsoft.gbb.reddog</groupId>
@@ -15,7 +15,7 @@
     <description>local-gateway</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <spring-cloud.version>2023.0.2</spring-cloud.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/...-gateway/src/main/java/com/microsoft/gbb/reddog/localgateway/LocalGatewayApplication.java b/...-gateway/src/main/java/com/microsoft/gbb/reddog/localgateway/LocalGatewayApplication.java
@@ -2,10 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
-@EnableEurekaClient
+@EnableDiscoveryClient
 public class LocalGatewayApplication {
 
     public static void main(String[] args) {

diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.9</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.microsoft.gbb.reddog</groupId>
@@ -15,10 +15,10 @@
     <description>gateway-service</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
-        <spring-cloud-azure.version>4.7.0</spring-cloud-azure.version>
+        <spring-cloud.version>2023.0.2</spring-cloud.version>
+        <spring-cloud-azure.version>5.13.0</spring-cloud-azure.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
     </properties>
     <dependencies>
         <dependency>
@@ -113,7 +113,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.24</version>
+                            <version>1.18.32</version>
                         </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -126,7 +126,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.7.0</version>
                 <executions>
                     <execution>
                         <id>copy-agent</id>
@@ -141,7 +141,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.azure</groupId>
                             <artifactId>applicationinsights-agent</artifactId>
-                            <version>3.4.6</version>
+                            <version>3.5.3</version>
                             <outputDirectory>${project.build.directory}/agent</outputDirectory>
                             <destFileName>applicationinsights-agent.jar</destFileName>
                         </artifactItem>

diff --git a/...vice/src/main/java/com/microsoft/gbb/reddog/gatewayservice/GatewayServiceApplication.java b/...vice/src/main/java/com/microsoft/gbb/reddog/gatewayservice/GatewayServiceApplication.java
@@ -2,10 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
-@EnableEurekaClient
+@EnableDiscoveryClient
 public class GatewayServiceApplication {
 
     public static void main(String[] args) {

diff --git a/loyalty-service/pom.xml b/loyalty-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.9</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.microsoft.gbb.reddog</groupId>
@@ -16,8 +16,8 @@
     <properties>
         <java.version>17</java.version>
         <opentelemetry.version>1.6.0</opentelemetry.version>
-        <spring-cloud-azure.version>4.7.0</spring-cloud-azure.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <spring-cloud-azure.version>5.13.0</spring-cloud-azure.version>
+        <spring-cloud.version>2023.0.2</spring-cloud.version>
     </properties>
     <dependencies>
         <dependency>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.6.11</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,6 +68,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
+            <version>3.1.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
@@ -128,7 +129,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.7.0</version>
                 <executions>
                     <execution>
                         <id>copy-agent</id>
@@ -143,7 +144,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.azure</groupId>
                             <artifactId>applicationinsights-agent</artifactId>
-                            <version>3.4.6</version>
+                            <version>3.5.3</version>
                             <outputDirectory>${project.build.directory}/agent</outputDirectory>
                             <destFileName>applicationinsights-agent.jar</destFileName>
                         </artifactItem>

diff --git a/...vice/src/main/java/com/microsoft/gbb/reddog/loyaltyservice/LoyaltyServiceApplication.java b/...vice/src/main/java/com/microsoft/gbb/reddog/loyaltyservice/LoyaltyServiceApplication.java
@@ -2,12 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableFeignClients
-@EnableEurekaClient
+@EnableDiscoveryClient
 public class LoyaltyServiceApplication {
 
     public static void main(String[] args) {

diff --git a/makeline-service/pom.xml b/makeline-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.9</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.microsoft.gbb.reddog</groupId>
@@ -16,12 +16,12 @@
     <properties>
         <java.version>17</java.version>
         <opentelemetry.version>1.6.0</opentelemetry.version>
-        <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
-        <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
+        <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+        <springdoc-openapi-ui.version>1.8.0</springdoc-openapi-ui.version>
         <azure-support.version>0.1.8</azure-support.version>
-        <azure.spring.data.cosmos.version>3.33.0</azure.spring.data.cosmos.version>
-        <spring-cloud-azure.version>4.7.0</spring-cloud-azure.version>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <azure.spring.data.cosmos.version>5.13.0</azure.spring.data.cosmos.version>
+        <spring-cloud-azure.version>5.13.0</spring-cloud-azure.version>
+        <spring-cloud.version>2023.0.2</spring-cloud.version>
     </properties>
     <dependencies>
         <dependency>
@@ -72,6 +72,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
+            <version>3.1.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
@@ -158,7 +159,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.24</version>
+                            <version>1.18.32</version>
                         </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -171,7 +172,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.7.0</version>
                 <executions>
                     <execution>
                         <id>copy-agent</id>
@@ -186,7 +187,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.azure</groupId>
                             <artifactId>applicationinsights-agent</artifactId>
-                            <version>3.4.6</version>
+                            <version>3.5.3</version>
                             <outputDirectory>${project.build.directory}/agent</outputDirectory>
                             <destFileName>applicationinsights-agent.jar</destFileName>
                         </artifactItem>

diff --git a/...ce/src/main/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplication.java b/...ce/src/main/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplication.java
@@ -3,13 +3,13 @@
 import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 
 @SpringBootApplication
 @EnableCosmosRepositories
 @EnableRedisRepositories
-@EnableEurekaClient
+@EnableDiscoveryClient
 public class MakelineServiceApplication {
 
     public static void main(String[] args) {