From cff5ba50fcd3921b3b4cf7c7a93fa6fbaf35f2a9 Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Tue, 19 Dec 2023 00:48:24 +0400 Subject: [PATCH 1/8] lombok issue fix --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3153198e6..8d648be6a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2022.0.4 2.3.10 1.7.1 - + 1.18.30 springcommunity 9090 ${basedir} @@ -58,6 +58,11 @@ jolokia-core ${jolokia-core.version} + + org.projectlombok + lombok + ${lombok.version} + From 1358837b0563c676a4f2fa5035a4204e83b69f64 Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Wed, 20 Dec 2023 12:39:31 +0400 Subject: [PATCH 2/8] Added comment - lombok issue fix --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 8d648be6a..6d166336a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,11 @@ 2022.0.4 2.3.10 1.7.1 + + 1.18.30 + springcommunity 9090 ${basedir} From 52ee66bb63b4676447f362db929a52bf2550b9ab Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Mon, 25 Dec 2023 11:33:47 +0400 Subject: [PATCH 3/8] Upgrade to Spring Cloud 2023.0.0 --- pom.xml | 13 ++----------- .../boundary/web/CircuitBreakerConfiguration.java | 9 +++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 6d166336a..7e1ebd3b2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.9 + 3.2.0 org.springframework.samples @@ -28,14 +28,10 @@ 17 - 2022.0.4 + 2023.0.0 2.3.10 1.7.1 - - 1.18.30 - springcommunity 9090 ${basedir} @@ -62,11 +58,6 @@ jolokia-core ${jolokia-core.version} - - org.projectlombok - lombok - ${lombok.version} - diff --git a/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/api/boundary/web/CircuitBreakerConfiguration.java b/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/api/boundary/web/CircuitBreakerConfiguration.java index 4fe17d0b8..0a240098b 100644 --- a/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/api/boundary/web/CircuitBreakerConfiguration.java +++ b/spring-petclinic-api-gateway/src/test/java/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(); + } + } From 04c3e0a997297b9610fb330a1deaef95bb0c85d8 Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Mon, 25 Dec 2023 11:52:32 +0400 Subject: [PATCH 4/8] Versioning the petclinic microservice --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf51e61b7..d07231ba2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 ${project.artifactId} pom From 2d4d88a928b06c05958cf7cabfa56edbf30d7544 Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Mon, 25 Dec 2023 12:54:54 +0400 Subject: [PATCH 5/8] Versioning the petclinic microservice --- spring-petclinic-admin-server/pom.xml | 2 +- spring-petclinic-api-gateway/pom.xml | 2 +- spring-petclinic-config-server/pom.xml | 2 +- spring-petclinic-customers-service/pom.xml | 2 +- spring-petclinic-discovery-server/pom.xml | 2 +- spring-petclinic-vets-service/pom.xml | 2 +- spring-petclinic-visits-service/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index 72075152c..395e99fb3 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index cc440f2dd..1c8df1151 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml index a2a9534c5..1bda2a9d8 100644 --- a/spring-petclinic-config-server/pom.xml +++ b/spring-petclinic-config-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml index 8c2fa3b9b..a8de2453a 100644 --- a/spring-petclinic-customers-service/pom.xml +++ b/spring-petclinic-customers-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml index f90a49a55..4710136c6 100644 --- a/spring-petclinic-discovery-server/pom.xml +++ b/spring-petclinic-discovery-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml index 3a4141e4a..a3427f491 100644 --- a/spring-petclinic-vets-service/pom.xml +++ b/spring-petclinic-vets-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml index a8f7f248d..cc89d53f0 100644 --- a/spring-petclinic-visits-service/pom.xml +++ b/spring-petclinic-visits-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 3.0.9 + 3.2.0 From b29416eadf5caa10095dda99d4d2e8b045f7daad Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Thu, 28 Dec 2023 14:00:35 +0400 Subject: [PATCH 6/8] Fix the docker image entrypoint --- docker-compose.yml | 13 +++++++------ spring-petclinic-admin-server/pom.xml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c06448582..dfae705e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,7 @@ services: image: springcommunity/spring-petclinic-config-server container_name: config-server mem_limit: 512M + entrypoint: [ "./dockerize","--","java", "org.springframework.boot.loader.launch.JarLauncher" ] ports: - 8888:8888 @@ -14,7 +15,7 @@ services: mem_limit: 512M depends_on: - config-server - entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 8761:8761 @@ -25,7 +26,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 8081:8081 @@ -36,7 +37,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 8082:8082 @@ -47,7 +48,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 8083:8083 @@ -58,7 +59,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 8080:8080 @@ -78,7 +79,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] ports: - 9090:9090 diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index 395e99fb3..ff3d7f05a 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -16,7 +16,7 @@ - 3.0.4 + 3.2.0 9090 ${basedir}/../docker From fac4bbdc4315b9645f14ba4d937d02add5c2b149 Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Thu, 28 Dec 2023 14:16:12 +0400 Subject: [PATCH 7/8] reverting --- docker-compose.yml | 13 ++++++------- spring-petclinic-admin-server/pom.xml | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dfae705e7..c06448582 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,6 @@ services: image: springcommunity/spring-petclinic-config-server container_name: config-server mem_limit: 512M - entrypoint: [ "./dockerize","--","java", "org.springframework.boot.loader.launch.JarLauncher" ] ports: - 8888:8888 @@ -15,7 +14,7 @@ services: mem_limit: 512M depends_on: - config-server - entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 8761:8761 @@ -26,7 +25,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 8081:8081 @@ -37,7 +36,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 8082:8082 @@ -48,7 +47,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 8083:8083 @@ -59,7 +58,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 8080:8080 @@ -79,7 +78,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.launch.JarLauncher"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"] ports: - 9090:9090 diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index ff3d7f05a..395e99fb3 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -16,7 +16,7 @@ - 3.2.0 + 3.0.4 9090 ${basedir}/../docker From aed9c1f55d44ada78b71cafc8b7558297bda94bb Mon Sep 17 00:00:00 2001 From: shobhakamath Date: Thu, 28 Dec 2023 14:34:56 +0400 Subject: [PATCH 8/8] Fixing the entrypoint class --- docker/Dockerfile | 2 +- spring-petclinic-admin-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b9f789b63..80bd0aa69 100644 --- 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/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index 395e99fb3..ff3d7f05a 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -16,7 +16,7 @@ - 3.0.4 + 3.2.0 9090 ${basedir}/../docker