Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Andy Wilkinson 2019-03-06 13:33:00 +00:00
commit ff64e112c9

View File

@ -66,12 +66,12 @@
<glassfish-jaxb.version>2.3.1</glassfish-jaxb.version>
<groovy.version>2.5.6</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.11.1</hazelcast.version>
<hazelcast-hibernate5.version>1.2.3</hazelcast-hibernate5.version>
<hibernate.version>5.3.7.Final</hibernate.version>
<hibernate-validator.version>6.0.14.Final</hibernate-validator.version>
<hibernate-validator.version>6.0.15.Final</hibernate-validator.version>
<hikaricp.version>3.2.0</hikaricp.version>
<hsqldb.version>2.4.1</hsqldb.version>
<htmlunit.version>2.33</htmlunit.version>
@ -101,10 +101,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.27</jersey.version>
<jest.version>6.3.1</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>
<jetty-reactive-httpclient.version>1.0.2</jetty-reactive-httpclient.version>
@ -138,7 +138,7 @@
<mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
<mysql.version>8.0.15</mysql.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>3.1.7</neo4j-ogm.version>
<neo4j-ogm.version>3.1.8</neo4j-ogm.version>
<netty.version>4.1.33.Final</netty.version>
<netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
@ -158,7 +158,7 @@
<selenium-htmlunit.version>2.33.0</selenium-htmlunit.version>
<sendgrid.version>4.3.0</sendgrid.version>
<servlet-api.version>4.0.1</servlet-api.version>
<slf4j.version>1.7.25</slf4j.version>
<slf4j.version>1.7.26</slf4j.version>
<snakeyaml.version>1.23</snakeyaml.version>
<solr.version>7.4.0</solr.version>
<!-- deprecated in favor of "spring-framework.version" -->
@ -177,7 +177,7 @@
<spring-retry.version>1.2.4.RELEASE</spring-retry.version>
<spring-security.version>5.1.4.RELEASE</spring-security.version>
<spring-session-bom.version>Bean-SR3</spring-session-bom.version>
<spring-ws.version>3.0.6.RELEASE</spring-ws.version>
<spring-ws.version>3.0.7.RELEASE</spring-ws.version>
<sqlite-jdbc.version>3.25.2</sqlite-jdbc.version>
<statsd-client.version>3.1.0</statsd-client.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>