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

Merge branch '1.1.x' into 1.2.x 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-03-04 17:55:20 +00:00
parent 71dde3ec89 44d98c6186
commit 9f0654bd77
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@
<derby.version>10.10.2.0</derby.version>
<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
<flyway.version>3.1</flyway.version>
<freemarker.version>2.3.21</freemarker.version>
<freemarker.version>2.3.22</freemarker.version>
<gemfire.version>7.0.2</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.6</gradle.version>