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' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-02-09 10:18:40 +00:00
parent 23d7a6bd8f 6aaa5ee933
commit b40f689e1d
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

@ -59,7 +59,7 @@
<commons-digester.version>2.1</commons-digester.version> <commons-digester.version>2.1</commons-digester.version>
<commons-pool.version>1.6</commons-pool.version> <commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.2</commons-pool2.version> <commons-pool2.version>2.2</commons-pool2.version>
<crashub.version>1.3.0</crashub.version> <crashub.version>1.3.1</crashub.version>
<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version> <dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
<flyway.version>3.1</flyway.version> <flyway.version>3.1</flyway.version>
<freemarker.version>2.3.21</freemarker.version> <freemarker.version>2.3.21</freemarker.version>