Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-07-08 09:56:10 +01:00
commit 0f700e9c5e
1 changed files with 5 additions and 5 deletions

View File

@ -48,7 +48,7 @@
<!-- Dependency versions --> <!-- Dependency versions -->
<activemq.version>5.15.0</activemq.version> <activemq.version>5.15.0</activemq.version>
<antlr2.version>2.7.7</antlr2.version> <antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.53</appengine-sdk.version> <appengine-sdk.version>1.9.54</appengine-sdk.version>
<artemis.version>2.1.0</artemis.version> <artemis.version>2.1.0</artemis.version>
<aspectj.version>1.8.10</aspectj.version> <aspectj.version>1.8.10</aspectj.version>
<assertj.version>3.8.0</assertj.version> <assertj.version>3.8.0</assertj.version>
@ -92,7 +92,7 @@
<httpasyncclient.version>4.1.3</httpasyncclient.version> <httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.3</httpclient.version> <httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version> <httpcore.version>4.4.6</httpcore.version>
<infinispan.version>8.2.6.Final</infinispan.version> <infinispan.version>8.2.7.Final</infinispan.version>
<influxdb-java.version>2.7</influxdb-java.version> <influxdb-java.version>2.7</influxdb-java.version>
<jackson.version>2.9.0.pr4</jackson.version> <jackson.version>2.9.0.pr4</jackson.version>
<janino.version>3.0.7</janino.version> <janino.version>3.0.7</janino.version>
@ -116,7 +116,7 @@
<jmustache.version>1.13</jmustache.version> <jmustache.version>1.13</jmustache.version>
<jna.version>4.4.0</jna.version> <jna.version>4.4.0</jna.version>
<joda-time.version>2.9.9</joda-time.version> <joda-time.version>2.9.9</joda-time.version>
<jolokia.version>1.3.6</jolokia.version> <jolokia.version>1.3.7</jolokia.version>
<jooq.version>3.9.3</jooq.version> <jooq.version>3.9.3</jooq.version>
<jsonassert.version>1.5.0</jsonassert.version> <jsonassert.version>1.5.0</jsonassert.version>
<json-path.version>2.3.0</json-path.version> <json-path.version>2.3.0</json-path.version>
@ -127,7 +127,7 @@
<liquibase.version>3.5.3</liquibase.version> <liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.8.2</log4j2.version> <log4j2.version>2.8.2</log4j2.version>
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<lombok.version>1.16.16</lombok.version> <lombok.version>1.16.18</lombok.version>
<mariadb.version>2.0.2</mariadb.version> <mariadb.version>2.0.2</mariadb.version>
<mssql-jdbc.version>6.2.0.jre8</mssql-jdbc.version> <mssql-jdbc.version>6.2.0.jre8</mssql-jdbc.version>
<mockito.version>2.8.47</mockito.version> <mockito.version>2.8.47</mockito.version>
@ -185,7 +185,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.0.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.16</tomcat.version> <tomcat.version>8.5.16</tomcat.version>
<undertow.version>1.4.16.Final</undertow.version> <undertow.version>1.4.18.Final</undertow.version>
<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version> <unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version> <webjars-hal-browser.version>3325375</webjars-hal-browser.version>
<webjars-locator.version>0.32-1</webjars-locator.version> <webjars-locator.version>0.32-1</webjars-locator.version>