Merge branch '1.2.x'

pull/2928/merge
Andy Wilkinson 10 years ago
commit 5b30716d94

@ -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>

Loading…
Cancel
Save