Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-05-12 10:18:00 +01:00
commit cab30df5a2
1 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,7 @@
<!-- Dependency versions -->
<activemq.version>5.14.5</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.51</appengine-sdk.version>
<appengine-sdk.version>1.9.53</appengine-sdk.version>
<artemis.version>1.5.4</artemis.version>
<aspectj.version>1.8.10</aspectj.version>
<assertj.version>3.6.2</assertj.version>
@ -132,7 +132,7 @@
<mockito.version>2.7.22</mockito.version>
<mongo-driver-reactivestreams.version>1.3.0</mongo-driver-reactivestreams.version>
<mongodb.version>3.4.2</mongodb.version>
<mysql.version>5.1.41</mysql.version>
<mysql.version>5.1.42</mysql.version>
<narayana.version>5.5.7.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>3.0.0-M01</neo4j-ogm.version>