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' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-04-07 11:36:40 +01:00
parent e2c47ba64a c8c2eea03e
commit e0d6ebca93
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

@ -116,12 +116,12 @@
<solr.version>4.7.2</solr.version>
<spock.version>0.7-groovy-2.0</spock.version>
<spring.version>4.2.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.4.3.RELEASE</spring-amqp.version>
<spring-amqp.version>1.4.4.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>
<spring-data-releasetrain.version>Fowler-RC1</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.2.RELEASE</spring-integration.version>
<spring-integration.version>4.1.3.RELEASE</spring-integration.version>
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
@ -138,7 +138,7 @@
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>8.0.20</tomcat.version>
<tomcat.version>8.0.21</tomcat.version>
<undertow.version>1.1.3.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>