Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-10-15 12:24:02 +01:00
commit 267eff15f1
1 changed files with 2 additions and 2 deletions

View File

@ -182,7 +182,7 @@
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<saaj-impl.version>1.5.0</saaj-impl.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-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
@ -2938,7 +2938,7 @@
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
<version>${thymeleaf-extras-springsecurity5.version}</version>
<version>${thymeleaf-extras-springsecurity.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>