Phillip Webb c4779a10ac Fix Mockito 2 support ...

See gh-7770

2017-01-05 16:27:41 -08:00

..

src

Fix Mockito 2 support

2017-01-05 16:27:41 -08:00

pom.xml

Merge branch '1.5.x'

2017-01-05 14:22:23 +01:00