Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Spring Cloud 2023.0.0 #249

Merged
merged 10 commits into from
Dec 28, 2023
Merged
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions spring-petclinic-admin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-petclinic-api-gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -17,4 +19,11 @@ public CircuitBreakerRegistry circuitBreakerRegistry() {
public TimeLimiterRegistry timeLimiterRegistry() {
return TimeLimiterRegistry.ofDefaults();
}

@Bean
@Primary
public Resilience4JConfigurationProperties resilience4JConfigurationProperties(){
return new Resilience4JConfigurationProperties();
}

}
2 changes: 1 addition & 1 deletion spring-petclinic-config-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-petclinic-customers-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-petclinic-discovery-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-petclinic-vets-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-petclinic-visits-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down