root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-05-11 11:45:11 +01:00
parent a5e9a38b76 ca94bd4b94
commit 5b30716d94
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

@ -74,7 +74,7 @@
<h2.version>1.4.185</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.4.1</hazelcast.version>
<hibernate.version>4.3.8.Final</hibernate.version>
<hibernate.version>4.3.9.Final</hibernate.version>
<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
<hikaricp.version>2.2.5</hikaricp.version>
@ -115,7 +115,7 @@
<sendgrid.version>2.1.0</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.11</slf4j.version>
<slf4j.version>1.7.12</slf4j.version>
<snakeyaml.version>1.14</snakeyaml.version>
<solr.version>4.10.1</solr.version>
<spock.version>0.7-groovy-2.0</spock.version>