root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Thymeleaf 3.1.0-M3 

See gh-32628
This commit is contained in:
Brian Clozel 2022-10-07 11:42:01 +02:00
parent 0f3b94592b
commit da7128ce7e
4 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -204,7 +204,6 @@ dependencies {
}
optional("org.thymeleaf:thymeleaf")
optional("org.thymeleaf:thymeleaf-spring6")
optional("org.thymeleaf.extras:thymeleaf-extras-java8time")
optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
optional("redis.clients:jedis")

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

@ -23,7 +23,6 @@ import jakarta.servlet.DispatcherType;
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
import org.thymeleaf.spring6.SpringTemplateEngine;
@ -252,16 +251,4 @@ public class ThymeleafAutoConfiguration {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Java8TimeDialect.class)
static class ThymeleafJava8TimeDialect {
@Bean
@ConditionalOnMissingBean
Java8TimeDialect java8TimeDialect() {
return new Java8TimeDialect();
}
}
}

9
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1531,7 +1531,7 @@ bom {
]
}
}
library("Thymeleaf", "3.1.0.M2") {
library("Thymeleaf", "3.1.0.M3") {
group("org.thymeleaf") {
modules = [
"thymeleaf",
@ -1546,13 +1546,6 @@ bom {
]
}
}
library("Thymeleaf Extras Java8Time", "3.0.4.RELEASE") {
group("org.thymeleaf.extras") {
modules = [
"thymeleaf-extras-java8time"
]
}
}
library("Thymeleaf Extras SpringSecurity", "3.1.0.M1") {
group("org.thymeleaf.extras") {
modules = [

1
spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle
View File

@ -7,5 +7,4 @@ description = "Starter for building MVC web applications using Thymeleaf views"
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.thymeleaf:thymeleaf-spring6")
api("org.thymeleaf.extras:thymeleaf-extras-java8time")
}