Hello, I have not been able to make a lot of progress on the Mockito migration myself, but Yash and Divij opened and merged a PR each.
The following PRs have made it into trunk: https://github.com/apache/kafka/pull/12615 https://github.com/apache/kafka/pull/12677 https://github.com/apache/kafka/pull/12492 Thank you to Yash and Divij for authoring them and to Chris and Bruno for the reviews! The following PRs are in progress: In need of reviewer attention - RA In need of author attention - AA https://github.com/apache/kafka/pull/12409 (RA) https://github.com/apache/kafka/pull/12418 (AA) https://github.com/apache/kafka/pull/12465 (RA) https://github.com/apache/kafka/pull/12505 (AA) https://github.com/apache/kafka/pull/12524 (RA) https://github.com/apache/kafka/pull/12527 (RA) https://github.com/apache/kafka/pull/12607 (AA) A summary of the Mockito migration: https://issues.apache.org/jira/browse/KAFKA-14133 <https://issues.apache.org/jira/browse/KAFKA-14133> - a little under 1/3 of all classes using EasyMock have been moved and merged; a bit over 1/3 are in PRs and around 1/3 are remaining. https://issues.apache.org/jira/browse/KAFKA-14132 <https://issues.apache.org/jira/browse/KAFKA-14132> - a little under 1/3 of all classes using PowerMock have been moved and merged; a bit over 2/3 are remaining. Best, Christo