Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-01-06 15:29:06 +01:00
commit 9da1c95325
1 changed files with 2 additions and 2 deletions

View File

@ -89,7 +89,7 @@
<hikaricp.version>2.5.1</hikaricp.version> <hikaricp.version>2.5.1</hikaricp.version>
<hikaricp-java6.version>2.3.13</hikaricp-java6.version> <hikaricp-java6.version>2.3.13</hikaricp-java6.version>
<hsqldb.version>2.3.3</hsqldb.version> <hsqldb.version>2.3.3</hsqldb.version>
<htmlunit.version>2.23</htmlunit.version> <htmlunit.version>2.21</htmlunit.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version> <httpasyncclient.version>4.1.2</httpasyncclient.version>
<httpclient.version>4.5.2</httpclient.version> <httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.5</httpcore.version> <httpcore.version>4.4.5</httpcore.version>
@ -140,7 +140,7 @@
<querydsl.version>4.1.4</querydsl.version> <querydsl.version>4.1.4</querydsl.version>
<reactor.version>3.0.4.RELEASE</reactor.version> <reactor.version>3.0.4.RELEASE</reactor.version>
<selenium.version>2.53.1</selenium.version> <selenium.version>2.53.1</selenium.version>
<selenium-htmlunit.version>2.23.2</selenium-htmlunit.version> <selenium-htmlunit.version>2.21</selenium-htmlunit.version>
<sendgrid.version>2.2.2</sendgrid.version> <sendgrid.version>2.2.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version> <servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version> <simple-json.version>1.1.1</simple-json.version>