Upgrade to Thymeleaf 3.1.0-M3

See gh-32628
pull/32633/head
Brian Clozel 2 years ago
parent 0f3b94592b
commit da7128ce7e

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

@ -23,7 +23,6 @@ import jakarta.servlet.DispatcherType;
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect; import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine; import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
import org.thymeleaf.spring6.SpringTemplateEngine; 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();
}
}
} }

@ -1531,7 +1531,7 @@ bom {
] ]
} }
} }
library("Thymeleaf", "3.1.0.M2") { library("Thymeleaf", "3.1.0.M3") {
group("org.thymeleaf") { group("org.thymeleaf") {
modules = [ modules = [
"thymeleaf", "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") { library("Thymeleaf Extras SpringSecurity", "3.1.0.M1") {
group("org.thymeleaf.extras") { group("org.thymeleaf.extras") {
modules = [ modules = [

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

Loading…
Cancel
Save