Commit 267eff15 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.0.x'

parents eaf38e93 ab7c1af3
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<sun-mail.version>${javax-mail.version}</sun-mail.version> <sun-mail.version>${javax-mail.version}</sun-mail.version>
<saaj-impl.version>1.5.0</saaj-impl.version> <saaj-impl.version>1.5.0</saaj-impl.version>
<thymeleaf.version>3.0.10.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.10.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity5.version>3.0.3.RELEASE</thymeleaf-extras-springsecurity5.version> <thymeleaf-extras-springsecurity.version>3.0.3.RELEASE</thymeleaf-extras-springsecurity.version>
<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version> <thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
...@@ -2938,7 +2938,7 @@ ...@@ -2938,7 +2938,7 @@
<dependency> <dependency>
<groupId>org.thymeleaf.extras</groupId> <groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId> <artifactId>thymeleaf-extras-springsecurity5</artifactId>
<version>${thymeleaf-extras-springsecurity5.version}</version> <version>${thymeleaf-extras-springsecurity.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment