From c2553a4b30892be35c56369c9323bf4445ac354e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Dec 2025 03:11:08 +0000 Subject: [PATCH 1/2] Bump springBootVersion from 3.5.7 to 4.0.1 Bumps `springBootVersion` from 3.5.7 to 4.0.1. Updates `org.springframework.boot:spring-boot-starter-web` from 3.5.7 to 4.0.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.1) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.5.7 to 4.0.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.1) Updates `org.springframework.boot:spring-boot-configuration-processor` from 3.5.7 to 4.0.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.1) Updates `org.springframework.boot:spring-boot-starter-test` from 3.5.7 to 4.0.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5550db8..e80bddc 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ group 'com.digitalsanctuary.cf.turnstile' description = 'SpringBoot Cloudflare Turnstile Library' ext { - springBootVersion = '3.5.7' + springBootVersion = '4.0.1' lombokVersion = '1.18.42' } From eee9216f908928c5c5c312600eb3e737073d1aff Mon Sep 17 00:00:00 2001 From: Devon Hillard Date: Mon, 22 Dec 2025 15:50:24 -0700 Subject: [PATCH 2/2] Fix Spring Boot 4.0 breaking changes for actuator modularization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spring Boot 4.0 reorganized packages as part of its modularization effort. This commit updates imports to use the new package locations: - ConditionalOnEnabledHealthIndicator: moved to org.springframework.boot.health.autoconfigure.contributor - MeterRegistryCustomizer: moved to org.springframework.boot.micrometer.metrics.autoconfigure - Health and HealthIndicator: moved to org.springframework.boot.health.contributor Also fixes Gradle DSL deprecation warning by using assignment syntax for the group property. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- build.gradle | 2 +- .../digitalsanctuary/cf/turnstile/TurnstileConfiguration.java | 4 ++-- .../cf/turnstile/config/TurnstileHealthIndicator.java | 4 ++-- .../cf/turnstile/config/TurnstileMetricsConfig.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e80bddc..f91b27c 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ 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' 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;