tree 39e2a660c3435db0b44a8adc6bcc3ba6a3144ea2
parent 31049a5a7341d871b88d10b0cbb42ce95c06f0c6
author Alexander Aprelev <aam@google.com> 1522264032 -0700
committer GitHub <noreply@github.com> 1522264032 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJau+fgCRBK7hj4Ov3rIwAAdHIIAHN7OjcT09c50VyGvI36Clw4
 REbYZKuVQ7oyantw6uG1YpCxN+AkwWVRK4yOCwa5BP81c0YOJ6bx128ydEDMi614
 9TWYK0sk9KBYTsQcEv8iiPf+sQJ4wpG9FoHswZaUATKSEA8K6fcWEHM7y7LlOqou
 gwXEqFzX6AUof3gCeVdEAl8WRnSFyIL65/0EHq3ITs5p/gMZu+oDN2sbI5yRhbGs
 /ivkZDkVYVkhu+W7PGyul8p+NNiNElRjoY32Ajc6/K090eDYb7hJI7BRKO3u1YxF
 0a+dRo21tFXX0UqVPw0/XSQlZyT91loR5mA904G5XVPteRwz5zt/2LJj9KWI/DU=
 =W8S7
 -----END PGP SIGNATURE-----
 

Again move mockito to 300plus2 (#15981)

* Revert "Revert "Move mockito to 3.0.0-alpha. (#15949)" (#15979)"

This reverts commit e59651f925917ed44a9bf27c37e80fc9992c0890.

* More thenReturn to thenAnswer when mocking Futures

* Revert "More thenReturn to thenAnswer when mocking Futures"

This reverts commit 194d2cf41754ad171efd6bb5898cf73bce5a75ab as we are reverting engine roll.

* Revert "Revert "More thenReturn to thenAnswer when mocking Futures""

This reverts commit 52c9e96b304b220f66d78a252fccea0c8e0ef24c.

* Add dependency override

* Fix issue