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

Merge branch '1.1.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2014-10-28 19:15:58 +00:00
parent b1e7cd0be2 812acec48f
commit 741d1f7273
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

@ -110,7 +110,7 @@
<spring.version>4.1.1.RELEASE</spring.version>
<spring-amqp.version>1.4.0.RC1</spring-amqp.version>
<spring-cloud.version>1.1.0.RELEASE</spring-cloud.version>
<spring-batch.version>3.0.1.RELEASE</spring-batch.version>
<spring-batch.version>3.0.2.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.0.RC1</spring-integration.version>
@ -1459,7 +1459,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<!-- Repositories to allow snapshot and milestone BOM imports during
<!-- Repositories to allow snapshot and milestone BOM imports during
development. This section is stripped out when a full release is prepared. -->
<repository>
<id>spring-milestones</id>