From b0c608c5929d1fef863260df03800fa379ff957d Mon Sep 17 00:00:00 2001 From: Emanuel Rabina Date: Sun, 17 Sep 2023 10:18:18 +1200 Subject: [PATCH] Update Thymeleaf and use dependencies that work with it --- CHANGELOG.md | 7 +++++++ build.gradle | 4 ++-- thymeleaf-layout-dialect-docs/getting-started.md | 2 +- thymeleaf-layout-dialect/build.gradle | 10 +++++----- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3cf262d..0c9e8ef2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ Changelog ========= +### 3.3.0 + + - Upgrade Groovy to 4.0.14 + - Upgrade Thymeleaf to 3.1.2.RELEASE + + ### 3.2.1 - Upgrade Groovy to 4.0.10 @@ -10,6 +16,7 @@ Changelog - Updated [thymeleaf-expression-processor](https://github.com/ultraq/thymeleaf-expression-processor), which also contains GraalVM native-image metadata + ### 3.2.0 - Remove old log warning about `layout:fragment` in the `` section diff --git a/build.gradle b/build.gradle index a62ef8c9..55e0ad72 100644 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,10 @@ */ allprojects { - version = '3.2.1' + version = '3.3.0-SNAPSHOT' ext { groovyVersion = '4.0.14' - thymeleafVersion = '3.0.15.RELEASE' + thymeleafVersion = '3.1.2.RELEASE' } } diff --git a/thymeleaf-layout-dialect-docs/getting-started.md b/thymeleaf-layout-dialect-docs/getting-started.md index a74d594f..25703b55 100644 --- a/thymeleaf-layout-dialect-docs/getting-started.md +++ b/thymeleaf-layout-dialect-docs/getting-started.md @@ -28,7 +28,7 @@ co-ordinates: - GroupId: `nz.net.ultraq.thymeleaf` - ArtifactId: `thymeleaf-layout-dialect` - - Version: `3.2.1` + - Version: `3.3.0` Check the [project releases](https://github.com/ultraq/thymeleaf-layout-dialect/releases) for a list of available versions. Each release page also includes a diff --git a/thymeleaf-layout-dialect/build.gradle b/thymeleaf-layout-dialect/build.gradle index 19de0b96..5f7d26f0 100644 --- a/thymeleaf-layout-dialect/build.gradle +++ b/thymeleaf-layout-dialect/build.gradle @@ -32,19 +32,19 @@ year = '2012' dependencies { api "org.apache.groovy:groovy:${groovyVersion}" implementation 'nz.net.ultraq.groovy:groovy-extensions:2.1.0' - implementation 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:3.1.1' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:3.2.0-SNAPSHOT' implementation "org.thymeleaf:thymeleaf:${thymeleafVersion}" - implementation 'org.slf4j:slf4j-api:1.7.36' + implementation 'org.slf4j:slf4j-api:2.0.9' codenarc 'org.codenarc:CodeNarc:3.3.0-groovy-4.0' testImplementation 'net.bytebuddy:byte-buddy:1.14.7' - testImplementation 'nz.net.ultraq.thymeleaf:thymeleaf-testing-junit:5.1.0' + testImplementation 'nz.net.ultraq.thymeleaf:thymeleaf-testing-junit:5.2.0-SNAPSHOT' testImplementation 'org.objenesis:objenesis:3.3' testImplementation 'org.reflections:reflections:0.10.2' testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' - testImplementation 'org.thymeleaf:thymeleaf-testing:3.0.4.RELEASE' + testImplementation "org.thymeleaf.testing:thymeleaf-testing:${thymeleafVersion}" testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.36' + testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.9' } java {