Commit 0b5f52ef authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.0.x'

parents fa26227a 9ca96cb7
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<!-- Dependency versions --> <!-- Dependency versions -->
<activemq.version>5.15.7</activemq.version> <activemq.version>5.15.8</activemq.version>
<antlr2.version>2.7.7</antlr2.version> <antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.68</appengine-sdk.version> <appengine-sdk.version>1.9.68</appengine-sdk.version>
<artemis.version>2.6.3</artemis.version> <artemis.version>2.6.3</artemis.version>
...@@ -81,14 +81,14 @@ ...@@ -81,14 +81,14 @@
<infinispan.version>9.4.0.Final</infinispan.version> <infinispan.version>9.4.0.Final</infinispan.version>
<influxdb-java.version>2.14</influxdb-java.version> <influxdb-java.version>2.14</influxdb-java.version>
<jackson.version>2.9.7</jackson.version> <jackson.version>2.9.7</jackson.version>
<janino.version>3.0.10</janino.version> <janino.version>3.0.11</janino.version>
<javax-activation.version>1.2.0</javax-activation.version> <javax-activation.version>1.2.0</javax-activation.version>
<javax-annotation.version>1.3.2</javax-annotation.version> <javax-annotation.version>1.3.2</javax-annotation.version>
<javax-cache.version>1.1.0</javax-cache.version> <javax-cache.version>1.1.0</javax-cache.version>
<javax-jaxws.version>2.3.1</javax-jaxws.version> <javax-jaxws.version>2.3.1</javax-jaxws.version>
<javax-jaxb.version>2.3.1</javax-jaxb.version> <javax-jaxb.version>2.3.1</javax-jaxb.version>
<javax-jms.version>2.0.1</javax-jms.version> <javax-jms.version>2.0.1</javax-jms.version>
<javax-json.version>1.1.3</javax-json.version> <javax-json.version>1.1.4</javax-json.version>
<javax-jsonb.version>1.0</javax-jsonb.version> <javax-jsonb.version>1.0</javax-jsonb.version>
<javax-mail.version>1.6.2</javax-mail.version> <javax-mail.version>1.6.2</javax-mail.version>
<javax-money.version>1.0.3</javax-money.version> <javax-money.version>1.0.3</javax-money.version>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<jest.version>6.3.1</jest.version> <jest.version>6.3.1</jest.version>
<jetty.version>9.4.14.v20181114</jetty.version> <jetty.version>9.4.14.v20181114</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.5.33</jetty-el.version> <jetty-el.version>8.5.33.1</jetty-el.version>
<jetty-reactive-httpclient.version>1.0.1</jetty-reactive-httpclient.version> <jetty-reactive-httpclient.version>1.0.1</jetty-reactive-httpclient.version>
<jmustache.version>1.14</jmustache.version> <jmustache.version>1.14</jmustache.version>
<jna.version>4.5.2</jna.version> <jna.version>4.5.2</jna.version>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<spring.version>5.1.3.BUILD-SNAPSHOT</spring.version> <spring.version>5.1.3.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.1.0.RELEASE</spring-amqp.version> <spring-amqp.version>2.1.0.RELEASE</spring-amqp.version>
<spring-batch.version>4.1.0.RELEASE</spring-batch.version> <spring-batch.version>4.1.0.RELEASE</spring-batch.version>
<spring-cloud-connectors.version>2.0.3.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>2.0.4.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Lovelace-SR2</spring-data-releasetrain.version> <spring-data-releasetrain.version>Lovelace-SR2</spring-data-releasetrain.version>
<spring-framework.version>${spring.version}</spring-framework.version> <spring-framework.version>${spring.version}</spring-framework.version>
<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version> <thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>9.0.12</tomcat.version> <tomcat.version>9.0.12</tomcat.version>
<unboundid-ldapsdk.version>4.0.8</unboundid-ldapsdk.version> <unboundid-ldapsdk.version>4.0.9</unboundid-ldapsdk.version>
<undertow.version>2.0.14.Final</undertow.version> <undertow.version>2.0.14.Final</undertow.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version> <webjars-hal-browser.version>3325375</webjars-hal-browser.version>
<webjars-locator-core.version>0.35</webjars-locator-core.version> <webjars-locator-core.version>0.35</webjars-locator-core.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment