root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
Conflicts:
	spring-boot-dependencies/pom.xml
pull/1763/merge
Andy Wilkinson 10 years ago
parent b1e7cd0be2 812acec48f
commit 741d1f7273
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -110,7 +110,7 @@
<spring.version>4.1.1.RELEASE</spring.version> <spring.version>4.1.1.RELEASE</spring.version>
<spring-amqp.version>1.4.0.RC1</spring-amqp.version> <spring-amqp.version>1.4.0.RC1</spring-amqp.version>
<spring-cloud.version>1.1.0.RELEASE</spring-cloud.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-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.0.RC1</spring-integration.version> <spring-integration.version>4.1.0.RC1</spring-integration.version>

Write Preview
Loading…
Cancel
Save