From c04cda09e288147b484ad53c53af8c8ba970e657 Mon Sep 17 00:00:00 2001
From: childrengreens <childrengreens@163.com>
Date: Mon, 29 Dec 2025 18:06:14 +0800
Subject: [PATCH] refactor: Update health indicator imports and upgrade Spring
 Boot version to 4.0.1

---
 spring/pom.xml                                  | 17 +++++++++--------
 .../spring/health/InfluxDB2HealthIndicator.java |  6 +++---
 ...fluxDB2HealthIndicatorAutoConfiguration.java |  6 +++---
 ...DB2HealthIndicatorAutoConfigurationTest.java |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/spring/pom.xml b/spring/pom.xml
index defbd7cae0f..c83b9c61d42 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -73,7 +73,7 @@
 
     <properties>
         <micrometer.version>1.15.2</micrometer.version>
-        <spring-boot.version>3.5.5</spring-boot.version>
+        <spring-boot.version>4.0.1</spring-boot.version>
         <spring.version>6.1.3</spring.version>
     </properties>
 
@@ -121,15 +121,16 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>${spring-boot.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-health</artifactId>
             <version>${spring-boot.version}</version>
             <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java b/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java
index 7d5485d5b5a..269b60047ac 100644
--- a/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java
+++ b/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java
@@ -23,9 +23,9 @@
 
 import com.influxdb.client.InfluxDBClient;
 
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.health.contributor.AbstractHealthIndicator;
+import org.springframework.boot.health.contributor.Health;
+import org.springframework.boot.health.contributor.HealthIndicator;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java b/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java
index 58467860b75..2f5efca58f6 100644
--- a/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java
+++ b/spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java
@@ -26,14 +26,14 @@
 import com.influxdb.client.InfluxDBClient;
 import com.influxdb.spring.influx.InfluxDB2AutoConfiguration;
 
-import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.health.HealthContributor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.health.autoconfigure.contributor.CompositeHealthContributorConfiguration;
+import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.health.contributor.HealthContributor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
index d57fe38e515..2a19949ae45 100644
--- a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
+++ b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
@@ -24,7 +24,7 @@
 import com.influxdb.client.InfluxDBClient;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
+import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;