Merge branch '1.5.x' into 2.0.x

pull/13710/head
Andy Wilkinson 6 years ago
commit 9120f49721

@ -75,7 +75,7 @@
<htmlunit.version>2.29</htmlunit.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.5</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<httpcore.version>4.4.10</httpcore.version>
<infinispan.version>9.1.7.Final</infinispan.version>
<influxdb-java.version>2.9</influxdb-java.version>
<jackson.version>2.9.6</jackson.version>
@ -174,7 +174,7 @@
<thymeleaf-layout-dialect.version>2.3.0</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.31</tomcat.version>
<tomcat.version>8.5.32</tomcat.version>
<unboundid-ldapsdk.version>4.0.6</unboundid-ldapsdk.version>
<undertow.version>1.4.25.Final</undertow.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>
@ -185,7 +185,7 @@
<!-- Plugin versions -->
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
<git-commit-id-plugin.version>2.2.3</git-commit-id-plugin.version>
<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>

Loading…
Cancel
Save