Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source 
Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson
2015-03-26 17:19:44 +00:00
parent 5963760c9c 2cf23e08a0
commit 99fde7ac89
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@
<commons-pool2.version>2.2</commons-pool2.version>
<crashub.version>1.3.1</crashub.version>
<derby.version>10.10.2.0</derby.version>
<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
<dropwizard-metrics.version>3.1.1</dropwizard-metrics.version>
<flyway.version>3.2</flyway.version>
<freemarker.version>2.3.22</freemarker.version>
<gemfire.version>7.0.2</gemfire.version>
@@ -67,7 +67,7 @@
<gradle.version>1.12</gradle.version>
<groovy.version>2.4.1</groovy.version>
<gson.version>2.3.1</gson.version>
<h2.version>1.4.185</h2.version>
<h2.version>1.4.186</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hibernate.version>4.3.8.Final</hibernate.version>
<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
@@ -136,7 +136,7 @@
<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>8.0.20</tomcat.version>
<undertow.version>1.1.1.Final</undertow.version>
<undertow.version>1.1.3.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>
<wsdl4j.version>1.6.3</wsdl4j.version>