From 6fdc5ad808f69ef16ca35a687469862d72bcae29 Mon Sep 17 00:00:00 2001 From: JermaineHua Date: Mon, 14 Apr 2025 19:55:13 +0800 Subject: [PATCH 1/3] Upgrade spring boot version to 3.4.4 Signed-off-by: JermaineHua --- pom.xml | 4 ++-- .../sofa/boot/actuator/health/HealthIndicatorProcessor.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2a4266f85..b52b3fb5c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.7 + 3.4.4 com.alipay.sofa @@ -37,7 +37,7 @@ 4.5.0-SNAPSHOT ${revision} - 3.3.7 + 3.4.4 17 UTF-8 diff --git a/sofa-boot-project/sofa-boot-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/HealthIndicatorProcessor.java b/sofa-boot-project/sofa-boot-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/HealthIndicatorProcessor.java index a37cf2636..74dbb833b 100644 --- a/sofa-boot-project/sofa-boot-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/HealthIndicatorProcessor.java +++ b/sofa-boot-project/sofa-boot-actuator/src/main/java/com/alipay/sofa/boot/actuator/health/HealthIndicatorProcessor.java @@ -68,7 +68,8 @@ public class HealthIndicatorProcessor implements ApplicationContextAware { .asList( "com.alipay.sofa.boot.actuator.health.NonReadinessCheck", "org.springframework.boot.actuate.availability.ReadinessStateHealthIndicator", - "org.springframework.boot.actuate.availability.LivenessStateHealthIndicator"); + "org.springframework.boot.actuate.availability.LivenessStateHealthIndicator", + "org.springframework.boot.actuate.ssl.SslHealthIndicator"); private static final String REACTOR_CLASS = "reactor.core.publisher.Mono"; From 6c6d3e002dae0ab279b9ac93fee01d1867a0e4ef Mon Sep 17 00:00:00 2001 From: JermaineHua Date: Fri, 18 Apr 2025 12:26:51 +0800 Subject: [PATCH 2/3] Upgrade ci job Signed-off-by: JermaineHua --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b1ca14ddd..506d5e21e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: jdk: [17, 21] From 7930afb8b812f80c314291b42da9954fa2f2c67c Mon Sep 17 00:00:00 2001 From: JermaineHua Date: Fri, 18 Apr 2025 13:05:31 +0800 Subject: [PATCH 3/3] Upgrade spring cloud version to 2024.0.0 Signed-off-by: JermaineHua --- sofa-boot-project/sofaboot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml index 2c3eba748..a1cf4a047 100644 --- a/sofa-boot-project/sofaboot-dependencies/pom.xml +++ b/sofa-boot-project/sofaboot-dependencies/pom.xml @@ -31,7 +31,7 @@ 2.2.7 1.6.1 - 2023.0.3 + 2024.0.0 9.5 1.2.83 3.29.2-GA