Merge branch '1.5.x' into 2.0.x

pull/16246/head
Andy Wilkinson 6 years ago
commit 0a23f3b286

@ -35,7 +35,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.4.0</artemis.version>
<aspectj.version>1.8.13</aspectj.version>
<assertj.version>3.9.1</assertj.version>
@ -62,7 +62,7 @@
<freemarker.version>2.3.28</freemarker.version>
<elasticsearch.version>5.6.13</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<groovy.version>2.4.15</groovy.version>
<groovy.version>2.4.16</groovy.version>
<gson.version>2.8.5</gson.version>
<h2.version>1.4.197</h2.version>
<hamcrest.version>1.3</hamcrest.version>
@ -178,7 +178,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.2.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.35</tomcat.version>
<tomcat.version>8.5.37</tomcat.version>
<unboundid-ldapsdk.version>4.0.9</unboundid-ldapsdk.version>
<undertow.version>1.4.26.Final</undertow.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>

Loading…
Cancel
Save