Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2019-03-06 13:30:09 +00:00
commit 5f35a1d089

View File

@ -64,7 +64,7 @@
<glassfish-el.version>3.0.0</glassfish-el.version>
<groovy.version>2.4.16</groovy.version>
<gson.version>2.8.5</gson.version>
<h2.version>1.4.197</h2.version>
<h2.version>1.4.198</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.9.4</hazelcast.version>
<hazelcast-hibernate5.version>1.2.3</hazelcast-hibernate5.version>
@ -96,10 +96,10 @@
<jboss-logging.version>3.3.2.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.1</jedis.version>
<jedis.version>2.9.3</jedis.version>
<jersey.version>2.26</jersey.version>
<jest.version>5.3.4</jest.version>
<jetty.version>9.4.14.v20181114</jetty.version>
<jetty.version>9.4.15.v20190215</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.5.35.1</jetty-el.version>
<jmustache.version>1.14</jmustache.version>
@ -150,7 +150,7 @@
<sendgrid.version>4.1.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.25</slf4j.version>
<slf4j.version>1.7.26</slf4j.version>
<snakeyaml.version>1.19</snakeyaml.version>
<solr.version>6.6.5</solr.version>
<spring.version>5.0.12.RELEASE</spring.version>