Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2018-01-22 20:33:36 +00:00
commit b5444430ca

View File

@ -65,7 +65,7 @@
<hsqldb.version>2.4.0</hsqldb.version>
<htmlunit.version>2.29</htmlunit.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.4</httpclient.version>
<httpclient.version>4.5.5</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<infinispan.version>9.1.4.Final</infinispan.version>
<influxdb-java.version>2.8</influxdb-java.version>
@ -165,7 +165,7 @@
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.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>
<tomcat.version>8.5.24</tomcat.version>
<tomcat.version>8.5.27</tomcat.version>
<undertow.version>1.4.22.Final</undertow.version>
<unboundid-ldapsdk.version>4.0.3</unboundid-ldapsdk.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>