Skip to content

Commit ef5d5b1

Browse files
authored
chore: update dependencies to latest non-beta versions (#81)
* chore: update dependencies to latest non-beta versions - ben-manes versions plugin 0.53.0 -> 0.61.0 - guava 33.5.0-jre -> 33.6.0-jre - mariadb-java-client 3.5.7 -> 3.5.10 - springdoc-openapi-starter-webmvc-ui 3.0.1 -> 3.1.0 - thymeleaf-layout-dialect 3.4.0 -> 4.0.1 thymeleaf-layout-dialect 4.0.x is a Groovy 5 build aligned with Spring Boot 4, so the GROOVY-11745 workaround (Groovy exclude + explicit groovy:5.0.3 pin) is removed. Templates use only decorate/fragment/title-pattern processors, none of which changed in 4.0. Skipped: groovy 6.0.0-beta-1 and wiremock-standalone 4.0.0-beta.38 (beta). Deferred: Spring Boot 4.1.0 (bundles Thymeleaf 3.1.5, which breaks the app-wide ${@environment.getProperty(...)} template pattern under restricted expression evaluation) — tracked separately. Build and full test suite (301 tests) pass. * chore: upgrade Gradle wrapper 9.4.1 -> 9.7.0 Full build and test suite (301 tests) pass on 9.7.0.
1 parent e4a12e2 commit ef5d5b1

5 files changed

Lines changed: 26 additions & 46 deletions

File tree

build.gradle

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'java'
33
id 'org.springframework.boot' version '4.0.4'
44
id 'io.spring.dependency-management' version '1.1.7'
5-
id "com.github.ben-manes.versions" version "0.53.0"
5+
id "com.github.ben-manes.versions" version "0.61.0"
66

77
}
88

@@ -56,24 +56,17 @@ dependencies {
5656

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

7164
// OpenAPI (Swagger)
72-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1'
65+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0'
7366

7467
// Runtime dependencies
7568
runtimeOnly 'org.springframework.boot:spring-boot-devtools'
76-
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.5.7'
69+
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.5.10'
7770
runtimeOnly 'org.postgresql:postgresql'
7871

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

8982
// Compile-only dependencies

gradle/wrapper/gradle-wrapper.jar

2 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

gradlew

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 12 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)