From 91b0d6478b817d47f12ce8da4497be80dbf88ce8 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:16:12 +0300
Subject: [PATCH] [JAVA-22159] Upgraded circuitbreaker-resilience4j and spring
 boot version (#14316)

---
 pom.xml                                                   | 2 ++
 spring-cloud-modules/pom.xml                              | 2 +-
 spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index dbf8c942c3..3af4c1b6a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,6 +730,7 @@
                 <module>spring-drools</module>
                 <module>spring-cloud-modules/spring-cloud-contract</module>
                 <module>spring-cloud-modules/spring-cloud-data-flow</module>
+                <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
@@ -1000,6 +1001,7 @@
                 <module>spring-batch-2</module>
                 <module>spring-boot-rest</module>
                 <module>spring-drools</module>
+                <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index 3fd2f118dc..1ddc2f9015 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -43,7 +43,7 @@
         <module>spring-cloud-zuul</module>
         <module>spring-cloud-zuul-fallback</module>
         <module>spring-cloud-ribbon-retry</module>
-        <module>spring-cloud-circuit-breaker</module>
+<!--        <module>spring-cloud-circuit-breaker</module>-->
         <module>spring-cloud-eureka-self-preservation</module>
         <module>spring-cloud-openfeign</module>
         <module>spring-cloud-netflix-feign</module>
diff --git a/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml
index 3fe060c0b6..e2ba6433c0 100644
--- a/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml
+++ b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml
@@ -18,7 +18,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.2.4.RELEASE</version>
+                <version>${spring-boot-dependencies.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -38,7 +38,8 @@
     </dependencies>
 
     <properties>
-        <circuitbreaker-resilience4j.version>1.0.2.RELEASE</circuitbreaker-resilience4j.version>
+        <spring-boot-dependencies.version>3.0.1</spring-boot-dependencies.version>
+        <circuitbreaker-resilience4j.version>3.0.2</circuitbreaker-resilience4j.version>
     </properties>
 
 </project>
\ No newline at end of file