Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x'

Browse Source 
Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Phillip Webb 2014-05-15 15:09:24 +01:00
commit 7227c0df5f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-dependencies/pom.xml
View File

@ -109,9 +109,9 @@
<spring-security.version>3.2.3.RELEASE</spring-security.version>
<spring-security-oauth.version>2.0.0.RC2</spring-security-oauth.version>
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
<thymeleaf.version>2.1.2.RELEASE</thymeleaf.version>
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.3</thymeleaf-layout-dialect.version>
<thymeleaf-layout-dialect.version>1.2.4</thymeleaf-layout-dialect.version>
<tomcat.version>7.0.53</tomcat.version>
</properties>
<prerequisites>