diff --git a/build.gradle b/build.gradle index 5550db8..f91b27c 100644 --- a/build.gradle +++ b/build.gradle @@ -14,12 +14,12 @@ plugins { import com.vanniktech.maven.publish.JavaLibrary import com.vanniktech.maven.publish.JavadocJar -group 'com.digitalsanctuary.cf.turnstile' +group = 'com.digitalsanctuary.cf.turnstile' // version '1.1.6-SNAPSHOT' description = 'SpringBoot Cloudflare Turnstile Library' ext { - springBootVersion = '3.5.7' + springBootVersion = '4.0.1' lombokVersion = '1.18.42' } diff --git a/src/main/java/com/digitalsanctuary/cf/turnstile/TurnstileConfiguration.java b/src/main/java/com/digitalsanctuary/cf/turnstile/TurnstileConfiguration.java index 9e63c70..c36b92c 100644 --- a/src/main/java/com/digitalsanctuary/cf/turnstile/TurnstileConfiguration.java +++ b/src/main/java/com/digitalsanctuary/cf/turnstile/TurnstileConfiguration.java @@ -1,6 +1,6 @@ package com.digitalsanctuary.cf.turnstile; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Configuration; @@ -70,7 +70,7 @@ static class TurnstileMetricsConfiguration { */ @Configuration @ConditionalOnEnabledHealthIndicator("turnstile") - @ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") + @ConditionalOnClass(name = "org.springframework.boot.health.contributor.HealthIndicator") @Import(TurnstileHealthIndicator.class) static class TurnstileHealthConfiguration { } diff --git a/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileHealthIndicator.java b/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileHealthIndicator.java index 73fc087..bb48fe5 100644 --- a/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileHealthIndicator.java +++ b/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileHealthIndicator.java @@ -1,7 +1,7 @@ package com.digitalsanctuary.cf.turnstile.config; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileMetricsConfig.java b/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileMetricsConfig.java index 823c3ba..bdb3910 100644 --- a/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileMetricsConfig.java +++ b/src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileMetricsConfig.java @@ -1,6 +1,6 @@ package com.digitalsanctuary.cf.turnstile.config; -import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; +import org.springframework.boot.micrometer.metrics.autoconfigure.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean;