Skip to content

Commit b598e18

Browse files
refactor: Update health indicator imports and upgrade Spring Boot version to 4.0.1
1 parent 79b5074 commit b598e18

4 files changed

Lines changed: 16 additions & 15 deletions

File tree

spring/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<properties>
7575
<micrometer.version>1.15.2</micrometer.version>
76-
<spring-boot.version>3.5.5</spring-boot.version>
76+
<spring-boot.version>4.0.1</spring-boot.version>
7777
<spring.version>6.1.3</spring.version>
7878
</properties>
7979

@@ -121,15 +121,16 @@
121121

122122
<dependency>
123123
<groupId>org.springframework.boot</groupId>
124-
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
124+
<artifactId>spring-boot-autoconfigure</artifactId>
125+
<version>${spring-boot.version}</version>
126+
<optional>true</optional>
127+
</dependency>
128+
129+
<dependency>
130+
<groupId>org.springframework.boot</groupId>
131+
<artifactId>spring-boot-health</artifactId>
125132
<version>${spring-boot.version}</version>
126133
<optional>true</optional>
127-
<exclusions>
128-
<exclusion>
129-
<groupId>com.fasterxml.jackson.core</groupId>
130-
<artifactId>jackson-databind</artifactId>
131-
</exclusion>
132-
</exclusions>
133134
</dependency>
134135

135136
<dependency>

spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
import com.influxdb.client.InfluxDBClient;
2525

26-
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
27-
import org.springframework.boot.actuate.health.Health;
28-
import org.springframework.boot.actuate.health.HealthIndicator;
26+
import org.springframework.boot.health.contributor.AbstractHealthIndicator;
27+
import org.springframework.boot.health.contributor.Health;
28+
import org.springframework.boot.health.contributor.HealthIndicator;
2929
import org.springframework.util.Assert;
3030

3131
/**

spring/src/main/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import com.influxdb.client.InfluxDBClient;
2727
import com.influxdb.spring.influx.InfluxDB2AutoConfiguration;
2828

29-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
30-
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
31-
import org.springframework.boot.actuate.health.HealthContributor;
3229
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3330
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3431
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3532
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3633
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
34+
import org.springframework.boot.health.autoconfigure.contributor.CompositeHealthContributorConfiguration;
35+
import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
36+
import org.springframework.boot.health.contributor.HealthContributor;
3737
import org.springframework.context.annotation.Bean;
3838
import org.springframework.context.annotation.Configuration;
3939

spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.influxdb.client.InfluxDBClient;
2525

2626
import org.junit.jupiter.api.Test;
27-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
27+
import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
2929
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3030
import org.springframework.context.annotation.Bean;

0 commit comments

Comments
 (0)