root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-05-24 12:48:41 +01:00
parent b5174bed5d 7254ae84ab
commit 63b80d0d5f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-dependencies/pom.xml
View File

@ -49,7 +49,7 @@
<activemq.version>5.14.5</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.53</appengine-sdk.version>
<artemis.version>1.5.4</artemis.version>
<artemis.version>1.5.5</artemis.version>
<aspectj.version>1.8.10</aspectj.version>
<assertj.version>3.7.0</assertj.version>
<atomikos.version>3.9.3</atomikos.version>
@ -183,7 +183,7 @@
<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>
<tomcat.version>8.5.15</tomcat.version>
<undertow.version>1.4.14.Final</undertow.version>
<undertow.version>1.4.15.Final</undertow.version>
<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>
<webjars-locator.version>0.32-1</webjars-locator.version>