Upgrade to Spring Cloud 2023.0.0 (#249)

* lombok issue fix * Added comment - lombok issue fix * Upgrade to Spring Cloud 2023.0.0 * Versioning the petclinic microservice * Versioning the petclinic microservice * Fix the docker image entrypoint * reverting * Fixing the entrypoint class
spring-petclinic · Dec 28, 2023 · a538be2 · a538be2
1 parent 159be8f
commit a538be2
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 12 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -17,4 +17,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic-microservices</artifactId>
-    <version>3.0.9</version>
+    <version>3.2.0</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -28,7 +28,7 @@
     <properties>
         <java.version>17</java.version>
 
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <chaos-monkey-spring-boot.version>2.3.10</chaos-monkey-spring-boot.version>
         <jolokia-core.version>1.7.1</jolokia-core.version>
 

diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml
@@ -12,11 +12,11 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <properties>
-        <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
+        <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
         <docker.image.exposed.port>9090</docker.image.exposed.port>
         <docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
     </properties>

diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <properties>

diff --git a/...a/org/springframework/samples/petclinic/api/boundary/web/CircuitBreakerConfiguration.java b/...a/org/springframework/samples/petclinic/api/boundary/web/CircuitBreakerConfiguration.java
@@ -2,8 +2,10 @@
 
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
 import io.github.resilience4j.timelimiter.TimeLimiterRegistry;
+import org.springframework.cloud.circuitbreaker.resilience4j.Resilience4JConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 @Configuration
 public class CircuitBreakerConfiguration {
@@ -17,4 +19,11 @@ public CircuitBreakerRegistry circuitBreakerRegistry() {
     public TimeLimiterRegistry timeLimiterRegistry() {
         return TimeLimiterRegistry.ofDefaults();
     }
+
+    @Bean
+    @Primary
+    public Resilience4JConfigurationProperties resilience4JConfigurationProperties(){
+        return  new Resilience4JConfigurationProperties();
+    }
+
 }
diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <properties>

diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.samples</groupId>
 		<artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
 	</parent>
 
     <properties>

diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <properties>

diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.samples</groupId>
 		<artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
 	</parent>
 
     <properties>

diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>3.0.9</version>
+        <version>3.2.0</version>
     </parent>
 
     <properties>