Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-24 17:14:20 +00:00
commit 5c006d05f8
1 changed files with 4 additions and 4 deletions

View File

@ -75,10 +75,10 @@
<embedded-mongo.version>1.50.5</embedded-mongo.version>
<flyway.version>3.2.1</flyway.version>
<freemarker.version>2.3.25-incubating</freemarker.version>
<elasticsearch.version>2.4.3</elasticsearch.version>
<elasticsearch.version>2.4.4</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>2.9</gradle.version>
<groovy.version>2.4.7</groovy.version>
<groovy.version>2.4.8</groovy.version>
<gson.version>2.8.0</gson.version>
<h2.version>1.4.193</h2.version>
<hamcrest.version>1.3</hamcrest.version>
@ -92,7 +92,7 @@
<htmlunit.version>2.21</htmlunit.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version>
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.5</httpcore.version>
<httpcore.version>4.4.6</httpcore.version>
<infinispan.version>8.2.5.Final</infinispan.version>
<jackson.version>2.8.6</jackson.version>
<janino.version>2.7.8</janino.version>
@ -126,7 +126,7 @@
<junit.version>4.12</junit.version>
<liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.8</logback.version>
<logback.version>1.1.9</logback.version>
<lombok.version>1.16.12</lombok.version>
<mariadb.version>1.5.6</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>