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

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2014-12-10 16:03:45 +00:00
parent 89cdd303f6 42e2b9a41d
commit d0d640b3e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@
<gemfire.version>7.0.2</gemfire.version> <gemfire.version>7.0.2</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.6</gradle.version> <gradle.version>1.6</gradle.version>
<groovy.version>2.3.7</groovy.version> <groovy.version>2.3.8</groovy.version>
<gson.version>2.3</gson.version> <gson.version>2.3</gson.version>
<h2.version>1.4.182</h2.version> <h2.version>1.4.182</h2.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>