Skip to content

Commit da7128c

Browse files
committed
Upgrade to Thymeleaf 3.1.0-M3
See gh-32628
1 parent 0f3b945 commit da7128c

File tree

4 files changed

+1
-23
lines changed

4 files changed

+1
-23
lines changed

spring-boot-project/spring-boot-autoconfigure/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ dependencies {
204204
}
205205
optional("org.thymeleaf:thymeleaf")
206206
optional("org.thymeleaf:thymeleaf-spring6")
207-
optional("org.thymeleaf.extras:thymeleaf-extras-java8time")
208207
optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
209208
optional("redis.clients:jedis")
210209

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

-13
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
2424
import org.apache.commons.logging.Log;
2525
import org.apache.commons.logging.LogFactory;
26-
import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
2726
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
2827
import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
2928
import org.thymeleaf.spring6.SpringTemplateEngine;
@@ -252,16 +251,4 @@ SpringSecurityDialect securityDialect() {
252251

253252
}
254253

255-
@Configuration(proxyBeanMethods = false)
256-
@ConditionalOnClass(Java8TimeDialect.class)
257-
static class ThymeleafJava8TimeDialect {
258-
259-
@Bean
260-
@ConditionalOnMissingBean
261-
Java8TimeDialect java8TimeDialect() {
262-
return new Java8TimeDialect();
263-
}
264-
265-
}
266-
267254
}

spring-boot-project/spring-boot-dependencies/build.gradle

+1-8
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ bom {
15311531
]
15321532
}
15331533
}
1534-
library("Thymeleaf", "3.1.0.M2") {
1534+
library("Thymeleaf", "3.1.0.M3") {
15351535
group("org.thymeleaf") {
15361536
modules = [
15371537
"thymeleaf",
@@ -1546,13 +1546,6 @@ bom {
15461546
]
15471547
}
15481548
}
1549-
library("Thymeleaf Extras Java8Time", "3.0.4.RELEASE") {
1550-
group("org.thymeleaf.extras") {
1551-
modules = [
1552-
"thymeleaf-extras-java8time"
1553-
]
1554-
}
1555-
}
15561549
library("Thymeleaf Extras SpringSecurity", "3.1.0.M1") {
15571550
group("org.thymeleaf.extras") {
15581551
modules = [

spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ description = "Starter for building MVC web applications using Thymeleaf views"
77
dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("org.thymeleaf:thymeleaf-spring6")
10-
api("org.thymeleaf.extras:thymeleaf-extras-java8time")
1110
}

0 commit comments

Comments
 (0)