Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ dependencies {
implementation("org.hibernate.orm:hibernate-micrometer")

// Scheduling
implementation(libs.db.scheduler.spring.boot.starter)
implementation(libs.db.scheduler.boot4.starter)

// SpotBugs annotations (for @SuppressFBWarnings)
compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.8")
Expand Down Expand Up @@ -321,8 +321,7 @@ pitest {
excludedClasses = setOf(
"io.nextskip.common.config.AsyncConfig",
"io.nextskip.common.config.ClockConfig",
"io.nextskip.common.config.ResilienceConfig",
"io.nextskip.common.scheduler.DbSchedulerConfig"
"io.nextskip.common.config.ResilienceConfig"
)
mutators = setOf("DEFAULTS")
// Dynamic thread allocation: use 75% of available cores, minimum 2
Expand Down
5 changes: 3 additions & 2 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ com.github.docker-java:docker-java-transport-zerodep:3.7.0=testCompileClasspath,
com.github.docker-java:docker-java-transport:3.7.0=testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath,tmpTestImplementation
com.github.javaparser:javaparser-core:3.27.1=compileClasspath,developmentOnly,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-symbol-solver-core:3.27.1=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.kagkarlsson:db-scheduler-spring-boot-starter:16.6.0=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.kagkarlsson:db-scheduler:16.6.0=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.kagkarlsson:db-scheduler-spring-boot-4-starter:16.7.0=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.kagkarlsson:db-scheduler-spring-common:16.7.0=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.kagkarlsson:db-scheduler:16.7.0=compileClasspath,mainPmdAuxClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testPmdAuxClasspath,testRuntimeClasspath
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,mainPmdAuxClasspath,spotbugs
com.github.spotbugs:spotbugs:4.9.8=spotbugs
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jqwik = "1.9.3"
testcontainers = "2.0.3"

# Scheduling
db-scheduler = "16.6.0"
db-scheduler = "16.7.0"

# MQTT
paho-mqtt = "1.2.5"
Expand Down Expand Up @@ -74,7 +74,7 @@ postgresql = { module = "org.postgresql:postgresql" }
spring-boot-starter-liquibase = { module = "org.springframework.boot:spring-boot-starter-liquibase" }

# Scheduling
db-scheduler-spring-boot-starter = { module = "com.github.kagkarlsson:db-scheduler-spring-boot-starter", version.ref = "db-scheduler" }
db-scheduler-boot4-starter = { module = "com.github.kagkarlsson:db-scheduler-spring-boot-4-starter", version.ref = "db-scheduler" }

# Testcontainers (2.x uses testcontainers- prefix for modules)
spring-boot-testcontainers = { module = "org.springframework.boot:spring-boot-testcontainers" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
* <p>Uses the {@link RefreshTaskCoordinator} interface to automatically discover
* and coordinate all refresh tasks. New tasks are automatically included without
* modifying this class (Open-Closed Principle).
*
* <p>Note: Uses @ConditionalOnProperty instead of @ConditionalOnBean(Scheduler.class)
* because @ConditionalOnBean has timing issues with manual Scheduler configuration
* (Spring Boot 4 workaround). The property check is semantically equivalent since
* the Scheduler bean only exists when db-scheduler is enabled.
*/
@Component
@ConditionalOnProperty(value = "db-scheduler.enabled", havingValue = "true")
Expand Down
125 changes: 0 additions & 125 deletions src/main/java/io/nextskip/common/scheduler/DbSchedulerConfig.java

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ server:
spring:
application:
name: nextskip
# Exclude db-scheduler autoconfiguration (incompatible with Spring Boot 4)
# Manual configuration in DbSchedulerConfig.java until upstream fix is released
# Track: https://github.com/kagkarlsson/db-scheduler/issues/736
autoconfigure:
exclude:
- com.github.kagkarlsson.scheduler.boot.autoconfigure.DbSchedulerAutoConfiguration
# Static resource caching for PWA
web:
resources:
Expand Down