Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-22 12:42:10 +01:00
commit cf0018e88c

View File

@ -98,7 +98,7 @@
<mockito.version>1.9.5</mockito.version>
<mongodb.version>2.12.3</mongodb.version>
<mysql.version>5.1.32</mysql.version>
<reactor.version>1.1.4.RELEASE</reactor.version>
<reactor.version>1.1.5.RELEASE</reactor.version>
<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.7</slf4j.version>