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.2.x'

This commit is contained in:
Andy Wilkinson 2015-03-24 09:48:16 +00:00
parent 53ca15b478 6322ea142d
commit cebd58ad23
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

@ -111,7 +111,7 @@
<snakeyaml.version>1.14</snakeyaml.version>
<solr.version>4.7.2</solr.version>
<spock.version>0.7-groovy-2.0</spock.version>
<spring.version>4.1.5.RELEASE</spring.version>
<spring.version>4.1.6.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.4.3.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.3.RELEASE</spring-batch.version>
@ -1697,4 +1697,4 @@
<id>integration-test</id>
</profile>
</profiles>
</project>
</project>