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
23 changes: 8 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java'
id 'org.springframework.boot' version '4.0.4'
id 'io.spring.dependency-management' version '1.1.7'
id "com.github.ben-manes.versions" version "0.53.0"
id "com.github.ben-manes.versions" version "0.61.0"

}

Expand Down Expand Up @@ -56,24 +56,17 @@ dependencies {

// Thymeleaf extras - Spring Boot 4 manages the version
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
// Workaround for GROOVY-11745: Groovy 5.0.4 (shipped with Spring Boot 4.0.3) has a
// regression that causes an NPE when Groovy 5 code calls setters on objects from
// Groovy 4-compiled libraries. This breaks thymeleaf-layout-dialect 3.4.0 (compiled
// with Groovy 4.0.25) in DecorateProcessor.doProcess().
// See: https://issues.apache.org/jira/browse/GROOVY-11745
// See: https://github.com/ultraq/thymeleaf-layout-dialect/issues/251
// TODO: Remove this workaround when Groovy 5.0.5+ is available and adopted by Spring Boot
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.4.0') {
exclude group: 'org.apache.groovy'
}
implementation 'org.apache.groovy:groovy:5.0.3'
// thymeleaf-layout-dialect 4.0.x is compiled against Groovy 5 and aligned with Spring
// Boot 4, so the earlier GROOVY-11745 workaround (a Groovy exclude plus an explicit
// Groovy 5.0.3 pin, needed only because 3.4.0 was a Groovy 4 build) is no longer required.
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:4.0.1'

// OpenAPI (Swagger)
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0'

// Runtime dependencies
runtimeOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.5.7'
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.5.10'
runtimeOnly 'org.postgresql:postgresql'

// Docker Compose support for local development
Expand All @@ -83,7 +76,7 @@ dependencies {
// (passay is provided transitively by ds-spring-user-framework at the version it requires; the demo
// app does not use passay directly, so declaring/pinning it here previously forced a conflicting
// downgrade of the library's required passay version.)
implementation 'com.google.guava:guava:33.5.0-jre'
implementation 'com.google.guava:guava:33.6.0-jre'
implementation 'org.hibernate.validator:hibernate-validator'

// Compile-only dependencies
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 3 additions & 6 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 12 additions & 24 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading