Merge branch '2.0.x' into 2.1.x

pull/15692/head
Andy Wilkinson 6 years ago
commit a6a7c95d65

@ -36,7 +36,7 @@
<!-- Dependency versions -->
<activemq.version>5.15.8</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.68</appengine-sdk.version>
<appengine-sdk.version>1.9.71</appengine-sdk.version>
<artemis.version>2.6.3</artemis.version>
<aspectj.version>1.9.2</aspectj.version>
<assertj.version>3.11.1</assertj.version>
@ -80,7 +80,7 @@
<httpcore.version>4.4.10</httpcore.version>
<infinispan.version>9.4.3.Final</infinispan.version>
<influxdb-java.version>2.14</influxdb-java.version>
<jackson.version>2.9.7</jackson.version>
<jackson.version>2.9.8</jackson.version>
<janino.version>3.0.11</janino.version>
<javax-activation.version>1.2.0</javax-activation.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
@ -106,7 +106,7 @@
<jest.version>6.3.1</jest.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.5.33.1</jetty-el.version>
<jetty-el.version>8.5.35.1</jetty-el.version>
<jetty-reactive-httpclient.version>1.0.2</jetty-reactive-httpclient.version>
<jmustache.version>1.14</jmustache.version>
<jna.version>4.5.2</jna.version>
@ -139,7 +139,7 @@
<mysql.version>8.0.13</mysql.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>3.1.5</neo4j-ogm.version>
<netty.version>4.1.31.Final</netty.version>
<netty.version>4.1.32.Final</netty.version>
<netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
<pooled-jms-version>1.0.3</pooled-jms-version>

Loading…
Cancel
Save