| commit | 485a8bf69f05e36ec4f53256ab98626abeeaca02 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <[email protected]> | Mon Feb 24 04:58:17 2025 -0800 |
| committer | Gerrit Code Review <[email protected]> | Mon Feb 24 04:58:17 2025 -0800 |
| tree | f07e5d8003c9b051a210f49994ebbf85c4f53db7 | |
| parent | da4f8e5626f755016252659dba09e4d85ce742b8 [diff] | |
| parent | a3f9f8a134b119df3c44526dbb74de3c9ef4d474 [diff] |
Merge changes from topic "revert-3502139-revert-3500336-HUZKQGRTWV-COERBZPUTD" into main * changes: Revert "Revert "mockito: work around re-entrant stubbing of andr..." Revert^4 "Mockito: Suppress errorprone error" Revert^4 "mockito: Add back removed FieldSetter" Revert^4 "mockito: remove opentest4j dependency" Revert^4 "Upgrade mockito to v3.12.4"