Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-02-22 10:01:29 +00:00
commit 0de66a19f2
1 changed files with 9 additions and 9 deletions

View File

@ -48,7 +48,7 @@
<!-- Dependency versions -->
<activemq.version>5.14.3</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.48</appengine-sdk.version>
<appengine-sdk.version>1.9.49</appengine-sdk.version>
<artemis.version>1.5.2</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<assertj.version>3.6.2</assertj.version>
@ -89,11 +89,11 @@
<hikaricp.version>2.5.1</hikaricp.version>
<hsqldb.version>2.3.3</hsqldb.version>
<htmlunit.version>2.21</htmlunit.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version>
<httpclient.version>4.5.2</httpclient.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version>
<infinispan.version>8.2.5.Final</infinispan.version>
<jackson.version>2.8.6</jackson.version>
<infinispan.version>8.2.6.Final</infinispan.version>
<jackson.version>2.8.7</jackson.version>
<janino.version>2.7.8</janino.version>
<javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>
@ -126,8 +126,8 @@
<lettuce.version>5.0.0.Beta1</lettuce.version>
<liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.9</logback.version>
<lombok.version>1.16.12</lombok.version>
<logback.version>1.1.10</logback.version>
<lombok.version>1.16.14</lombok.version>
<mariadb.version>1.5.7</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
<mockito.version>2.5.4</mockito.version>
@ -149,9 +149,9 @@
<sendgrid.version>2.2.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.22</slf4j.version>
<slf4j.version>1.7.23</slf4j.version>
<snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.5.3</solr.version>
<solr.version>5.5.4</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>
<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.0.0.BUILD-SNAPSHOT</spring-amqp.version>