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

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2017-05-12 10:16:42 +01:00
parent 4e9731277a 7a84a48739
commit 2235d0c88a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@
<!-- Dependency versions --> <!-- Dependency versions -->
<activemq.version>5.14.5</activemq.version> <activemq.version>5.14.5</activemq.version>
<antlr2.version>2.7.7</antlr2.version> <antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.51</appengine-sdk.version> <appengine-sdk.version>1.9.53</appengine-sdk.version>
<artemis.version>1.5.4</artemis.version> <artemis.version>1.5.4</artemis.version>
<aspectj.version>1.8.10</aspectj.version> <aspectj.version>1.8.10</aspectj.version>
<assertj.version>2.6.0</assertj.version> <assertj.version>2.6.0</assertj.version>
@ -134,7 +134,7 @@
<mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version> <mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<mongodb.version>3.4.2</mongodb.version> <mongodb.version>3.4.2</mongodb.version>
<mysql.version>5.1.41</mysql.version> <mysql.version>5.1.42</mysql.version>
<narayana.version>5.5.7.Final</narayana.version> <narayana.version>5.5.7.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version> <nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.1.2</neo4j-ogm.version> <neo4j-ogm.version>2.1.2</neo4j-ogm.version>
@ -153,7 +153,7 @@
<spock.version>1.0-groovy-2.4</spock.version> <spock.version>1.0-groovy-2.4</spock.version>
<spring.version>4.3.8.RELEASE</spring.version> <spring.version>4.3.8.RELEASE</spring.version>
<spring-amqp.version>1.7.2.RELEASE</spring-amqp.version> <spring-amqp.version>1.7.2.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.2.4.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version> <spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Ingalls-SR3</spring-data-releasetrain.version> <spring-data-releasetrain.version>Ingalls-SR3</spring-data-releasetrain.version>
<spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version>