mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x' into 1.2.x
Conflicts: spring-boot-dependencies/pom.xml
This commit is contained in:
commit
9f0654bd77
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user