diff --git a/DEPS b/DEPS
index ff137d3..a17e26d 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
   'checkout_configuration': 'default',
   'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
   'webrtc_git': 'https://webrtc.googlesource.com',
-  'chromium_revision': 'cb8b61b491aad9c3b36dbfd705d52a7bfc3c2dda',
+  'chromium_revision': '72ef4e47846d30d3fa26599c7864efd38def1704',
   'boringssl_git': 'https://boringssl.googlesource.com',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
@@ -27,7 +27,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '53842b6cbc1fbab4f69ed5b9c2c30babd61cefbd',
+  'catapult_revision': '7a75f465f541280d20b4e96caf477517b0fc4b18',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -43,15 +43,15 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Chromium third_party
   # and whatever else without interference from each other.
-  'chromium_third_party_revision': 'b0f19bfaad365c8ae66dec47bd32419ab6e722fb',
+  'chromium_third_party_revision': '1703674da32a0f52f8037c71c59cc1555cb13091',
 }
 deps = {
   # TODO(kjellander): Move this to be Android-only once the libevent dependency
   # in base/third_party/libevent is solved.
   'src/base':
-    Var('chromium_git') + '/chromium/src/base' + '@' + '4d325e07edba19e2d68211f88546d799e70b5961',
+    Var('chromium_git') + '/chromium/src/base' + '@' + '9559d3ec4d8aeb3261c79143b24afccf06257199',
   'src/build':
-    Var('chromium_git') + '/chromium/src/build' + '@' + 'c3e2883ba813bc535ffe877ffd69a98804e3edc1',
+    Var('chromium_git') + '/chromium/src/build' + '@' + '379377c701fd069cbdc4a23c31f85939fff1f2fc',
   'src/buildtools':
     Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5941c1b3df96c1db756a2834343533335c394c4a',
   # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -61,11 +61,11 @@
     'condition': 'checkout_android',
   },
   'src/ios': {
-    'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '720bfc790a30282ce2685ea7cae2bdc7adc5f20a',
+    'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'a0396d2bffb1e73ac1c5b97e4a66947740f7ed64',
     'condition': 'checkout_ios',
   },
   'src/testing':
-    Var('chromium_git') + '/chromium/src/testing' + '@' + '12897eb458ff505af7ffaccff2b74cc0f9e2e920',
+    Var('chromium_git') + '/chromium/src/testing' + '@' + '6de780425ced9bb6f27b7a862019d5b067abfd72',
   # This entry is used for chromium third_party rolling into webrtc third_party only.
   'src/third_party_chromium': {
       'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
@@ -76,7 +76,7 @@
       'condition': 'checkout_android',
   },
   'src/third_party/android_tools': {
-    'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c22a664c39af72dd8f89200220713dcad811300a',
+    'url': Var('chromium_git') + '/android_tools.git' + '@' + '3545ab5b9883087a54cb9e5337c32617cb2a443d',
     'condition': 'checkout_android',
   },
   'src/third_party/auto/src': {
@@ -94,7 +94,7 @@
   'src/third_party/colorama/src':
     Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '04925ac3f7e50988945be3a5655198736a8b3e58',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '4099daa97b38b2ddb95e34d9fc3e2d37f58df069',
   'src/third_party/errorprone/lib': {
       'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
       'condition': 'checkout_android',
@@ -143,7 +143,7 @@
     'condition': 'checkout_android or checkout_linux',
   },
   'src/third_party/mockito/src': {
-    'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
+    'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '04a2a289a4222f80ad20717c25144981210d2eac',
     'condition': 'checkout_android',
   },
   'src/third_party/openh264/src':
@@ -185,7 +185,7 @@
   'src/third_party/yasm/source/patched-yasm':
     Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
   'src/tools':
-    Var('chromium_git') + '/chromium/src/tools' + '@' + '674f7d10b44126d54ddced36f0dd71a8d6b31b92',
+    Var('chromium_git') + '/chromium/src/tools' + '@' + '2e2b8c6c4c2a558ddbd74d7f7f920ea961f32996',
   'src/tools/swarming_client':
     Var('chromium_git') + '/infra/luci/client-py.git' + '@' +  Var('swarming_revision'),
 
@@ -248,7 +248,7 @@
       'packages': [
           {
               'package': 'chromium/third_party/byte_buddy',
-              'version': 'version:1.4.17-cr0',
+              'version': 'version:1.8.8-cr0',
           },
       ],
       'condition': 'checkout_android',
diff --git a/third_party/byte_buddy/BUILD.gn b/third_party/byte_buddy/BUILD.gn
index 2f81deb..b0c1b5d 100644
--- a/third_party/byte_buddy/BUILD.gn
+++ b/third_party/byte_buddy/BUILD.gn
@@ -5,6 +5,22 @@
 import("//build/config/android/rules.gni")
 
 java_prebuilt("byte_buddy_java") {
+  supports_android = true
   testonly = true
   jar_path = "lib/byte-buddy.jar"
 }
+
+java_prebuilt("byte_buddy_agent_java") {
+  supports_android = true
+  testonly = true
+  jar_path = "lib/byte-buddy-agent.jar"
+}
+
+android_java_prebuilt("byte_buddy_android_java") {
+  testonly = true
+  deps = [
+    "//third_party/android_tools:dx_25_0_2_java",
+  ]
+  proguard_configs = [ "//third_party/byte_buddy/proguard.flags" ]
+  jar_path = "lib/byte-buddy-android.jar"
+}
diff --git a/third_party/byte_buddy/README.chromium b/third_party/byte_buddy/README.chromium
index 052e6df..94aa424 100644
--- a/third_party/byte_buddy/README.chromium
+++ b/third_party/byte_buddy/README.chromium
@@ -1,10 +1,10 @@
 Name: Byte Buddy
 URL: http://bytebuddy.net/
-Version: 1.4.17
+Version: 1.8.8
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no
 Description:
 Byte Buddy is a code generation library for creating Java classes at runtime.
 
-Local Modifications: None
\ No newline at end of file
+Local Modifications: None
diff --git a/third_party/byte_buddy/cipd.yaml b/third_party/byte_buddy/cipd.yaml
index a43ae1e..db4fc1d 100644
--- a/third_party/byte_buddy/cipd.yaml
+++ b/third_party/byte_buddy/cipd.yaml
@@ -7,4 +7,6 @@
 package: chromium/third_party/byte_buddy
 description: byte_buddy Java library
 data:
+  - file: lib/byte-buddy-agent.jar
+  - file: lib/byte-buddy-android.jar
   - file: lib/byte-buddy.jar
diff --git a/third_party/byte_buddy/proguard.flags b/third_party/byte_buddy/proguard.flags
new file mode 100644
index 0000000..0476f36
--- /dev/null
+++ b/third_party/byte_buddy/proguard.flags
@@ -0,0 +1,9 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+-dontwarn net.bytebuddy.**
+
+-keep class net.bytebuddy.** {
+  *;
+}
diff --git a/third_party/mockito/BUILD.gn b/third_party/mockito/BUILD.gn
index ad2b01b..2c19da2 100644
--- a/third_party/mockito/BUILD.gn
+++ b/third_party/mockito/BUILD.gn
@@ -6,343 +6,476 @@
 
 java_library("mockito_java") {
   chromium_code = false
+  supports_android = true
   testonly = true
   deps = [
+    "//third_party/byte_buddy:byte_buddy_agent_java",
     "//third_party/byte_buddy:byte_buddy_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",
     "//third_party/objenesis:objenesis_java",
   ]
   java_files = [
+    "src/src/main/java/org/mockito/quality/MockitoHint.java",
+    "src/src/main/java/org/mockito/quality/package-info.java",
+    "src/src/main/java/org/mockito/quality/Strictness.java",
     "src/src/main/java/org/mockito/AdditionalAnswers.java",
-    "src/src/main/java/org/mockito/AdditionalMatchers.java",
-    "src/src/main/java/org/mockito/Answers.java",
-    "src/src/main/java/org/mockito/ArgumentCaptor.java",
-    "src/src/main/java/org/mockito/ArgumentMatcher.java",
-    "src/src/main/java/org/mockito/ArgumentMatchers.java",
-    "src/src/main/java/org/mockito/BDDMockito.java",
-    "src/src/main/java/org/mockito/Captor.java",
-    "src/src/main/java/org/mockito/InOrder.java",
-    "src/src/main/java/org/mockito/Incubating.java",
     "src/src/main/java/org/mockito/InjectMocks.java",
+    "src/src/main/java/org/mockito/NotExtensible.java",
+    "src/src/main/java/org/mockito/verification/VerificationMode.java",
+    "src/src/main/java/org/mockito/verification/After.java",
+    "src/src/main/java/org/mockito/verification/VerificationAfterDelay.java",
+    "src/src/main/java/org/mockito/verification/VerificationStrategy.java",
+    "src/src/main/java/org/mockito/verification/VerificationWithTimeout.java",
+    "src/src/main/java/org/mockito/verification/VerificationEvent.java",
+    "src/src/main/java/org/mockito/verification/package-info.java",
+    "src/src/main/java/org/mockito/verification/Timeout.java",
     "src/src/main/java/org/mockito/Matchers.java",
-    "src/src/main/java/org/mockito/Mock.java",
     "src/src/main/java/org/mockito/MockSettings.java",
-    "src/src/main/java/org/mockito/MockingDetails.java",
-    "src/src/main/java/org/mockito/Mockito.java",
-    "src/src/main/java/org/mockito/MockitoAnnotations.java",
-    "src/src/main/java/org/mockito/MockitoDebugger.java",
-    "src/src/main/java/org/mockito/MockitoFramework.java",
-    "src/src/main/java/org/mockito/Spy.java",
-    "src/src/main/java/org/mockito/configuration/AnnotationEngine.java",
-    "src/src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java",
-    "src/src/main/java/org/mockito/configuration/IMockitoConfiguration.java",
-    "src/src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java",
-    "src/src/main/java/org/mockito/exceptions/base/MockitoException.java",
-    "src/src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/NotAMockException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java",
-    "src/src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java",
-    "src/src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java",
-    "src/src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java",
-    "src/src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java",
-    "src/src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java",
-    "src/src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java",
-    "src/src/main/java/org/mockito/exceptions/verification/TooLittleActualInvocations.java",
-    "src/src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java",
-    "src/src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java",
-    "src/src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java",
-    "src/src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java",
+    "src/src/main/java/org/mockito/Captor.java",
+    "src/src/main/java/org/mockito/ArgumentMatcher.java",
+    "src/src/main/java/org/mockito/stubbing/OngoingStubbing.java",
+    "src/src/main/java/org/mockito/stubbing/ValidableAnswer.java",
+    "src/src/main/java/org/mockito/stubbing/VoidAnswer3.java",
+    "src/src/main/java/org/mockito/stubbing/VoidAnswer4.java",
+    "src/src/main/java/org/mockito/stubbing/Answer1.java",
+    "src/src/main/java/org/mockito/stubbing/VoidAnswer1.java",
+    "src/src/main/java/org/mockito/stubbing/VoidAnswer2.java",
+    "src/src/main/java/org/mockito/stubbing/VoidAnswer5.java",
+    "src/src/main/java/org/mockito/stubbing/Answer.java",
+    "src/src/main/java/org/mockito/stubbing/Answer2.java",
+    "src/src/main/java/org/mockito/stubbing/Answer5.java",
+    "src/src/main/java/org/mockito/stubbing/Stubbing.java",
+    "src/src/main/java/org/mockito/stubbing/Answer3.java",
+    "src/src/main/java/org/mockito/stubbing/package-info.java",
+    "src/src/main/java/org/mockito/stubbing/Stubber.java",
+    "src/src/main/java/org/mockito/stubbing/Answer4.java",
+    "src/src/main/java/org/mockito/Answers.java",
+    "src/src/main/java/org/mockito/hamcrest/package-info.java",
     "src/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java",
-    "src/src/main/java/org/mockito/internal/DefaultMockitoFramework.java",
-    "src/src/main/java/org/mockito/internal/InOrderImpl.java",
-    "src/src/main/java/org/mockito/internal/InternalMockHandler.java",
-    "src/src/main/java/org/mockito/internal/MockitoCore.java",
-    "src/src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java",
-    "src/src/main/java/org/mockito/internal/configuration/ClassPathLoader.java",
-    "src/src/main/java/org/mockito/internal/configuration/DefaultAnnotationEngine.java",
-    "src/src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java",
-    "src/src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java",
-    "src/src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java",
-    "src/src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java",
-    "src/src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java",
-    "src/src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/MockInjection.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java",
-    "src/src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java",
-    "src/src/main/java/org/mockito/internal/configuration/plugins/Plugins.java",
-    "src/src/main/java/org/mockito/internal/creation/DelegatingMethod.java",
-    "src/src/main/java/org/mockito/internal/creation/MockSettingsImpl.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/CachingMockBytecodeGenerator.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/InterceptedInvocation.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockBytecodeGenerator.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java",
-    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java",
-    "src/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java",
-    "src/src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java",
-    "src/src/main/java/org/mockito/internal/creation/instance/InstantiationException.java",
-    "src/src/main/java/org/mockito/internal/creation/instance/Instantiator.java",
-    "src/src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java",
-    "src/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java",
-    "src/src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java",
-    "src/src/main/java/org/mockito/internal/creation/util/SearchingClassLoader.java",
-    "src/src/main/java/org/mockito/internal/debugging/FindingsListener.java",
-    "src/src/main/java/org/mockito/internal/debugging/Localized.java",
-    "src/src/main/java/org/mockito/internal/debugging/LocationImpl.java",
-    "src/src/main/java/org/mockito/internal/debugging/LoggingListener.java",
-    "src/src/main/java/org/mockito/internal/debugging/MockitoDebuggerImpl.java",
-    "src/src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java",
-    "src/src/main/java/org/mockito/internal/debugging/WarningsCollector.java",
-    "src/src/main/java/org/mockito/internal/debugging/WarningsFinder.java",
-    "src/src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java",
-    "src/src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java",
-    "src/src/main/java/org/mockito/internal/exceptions/MockitoLimitations.java",
-    "src/src/main/java/org/mockito/internal/exceptions/Reporter.java",
-    "src/src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java",
-    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java",
-    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java",
-    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java",
-    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java",
-    "src/src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java",
-    "src/src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java",
-    "src/src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java",
-    "src/src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java",
-    "src/src/main/java/org/mockito/internal/handler/MockHandlerFactory.java",
-    "src/src/main/java/org/mockito/internal/handler/MockHandlerImpl.java",
-    "src/src/main/java/org/mockito/internal/handler/NullResultGuardian.java",
-    "src/src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java",
-    "src/src/main/java/org/mockito/internal/invocation/ArgumentsComparator.java",
-    "src/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java",
-    "src/src/main/java/org/mockito/internal/invocation/CapturesArgumentsFromInvocation.java",
-    "src/src/main/java/org/mockito/internal/invocation/InvocationImpl.java",
-    "src/src/main/java/org/mockito/internal/invocation/InvocationMarker.java",
-    "src/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java",
-    "src/src/main/java/org/mockito/internal/invocation/InvocationsFinder.java",
-    "src/src/main/java/org/mockito/internal/invocation/MatchersBinder.java",
-    "src/src/main/java/org/mockito/internal/invocation/MockitoMethod.java",
-    "src/src/main/java/org/mockito/internal/invocation/SerializableMethod.java",
-    "src/src/main/java/org/mockito/internal/invocation/StubInfoImpl.java",
-    "src/src/main/java/org/mockito/internal/invocation/UnusedStubsFinder.java",
-    "src/src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java",
-    "src/src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java",
-    "src/src/main/java/org/mockito/internal/invocation/realmethod/CleanTraceRealMethod.java",
-    "src/src/main/java/org/mockito/internal/invocation/realmethod/DefaultRealMethod.java",
-    "src/src/main/java/org/mockito/internal/invocation/realmethod/RealMethod.java",
-    "src/src/main/java/org/mockito/internal/junit/FriendlyExceptionMaker.java",
-    "src/src/main/java/org/mockito/internal/junit/JUnitDetecter.java",
-    "src/src/main/java/org/mockito/internal/junit/JUnitRule.java",
-    "src/src/main/java/org/mockito/internal/junit/JUnitTool.java",
-    "src/src/main/java/org/mockito/internal/listeners/CollectCreatedMocks.java",
-    "src/src/main/java/org/mockito/internal/listeners/MockingProgressListener.java",
-    "src/src/main/java/org/mockito/internal/listeners/MockingStartedListener.java",
-    "src/src/main/java/org/mockito/internal/listeners/NotifiedMethodInvocationReport.java",
-    "src/src/main/java/org/mockito/internal/matchers/And.java",
-    "src/src/main/java/org/mockito/internal/matchers/Any.java",
-    "src/src/main/java/org/mockito/internal/matchers/ArrayEquals.java",
-    "src/src/main/java/org/mockito/internal/matchers/CapturesArguments.java",
-    "src/src/main/java/org/mockito/internal/matchers/CapturingMatcher.java",
-    "src/src/main/java/org/mockito/internal/matchers/CompareEqual.java",
-    "src/src/main/java/org/mockito/internal/matchers/CompareTo.java",
-    "src/src/main/java/org/mockito/internal/matchers/Contains.java",
-    "src/src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java",
-    "src/src/main/java/org/mockito/internal/matchers/EndsWith.java",
-    "src/src/main/java/org/mockito/internal/matchers/Equality.java",
-    "src/src/main/java/org/mockito/internal/matchers/Equals.java",
-    "src/src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java",
-    "src/src/main/java/org/mockito/internal/matchers/Find.java",
-    "src/src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java",
-    "src/src/main/java/org/mockito/internal/matchers/GreaterThan.java",
-    "src/src/main/java/org/mockito/internal/matchers/InstanceOf.java",
-    "src/src/main/java/org/mockito/internal/matchers/LessOrEqual.java",
-    "src/src/main/java/org/mockito/internal/matchers/LessThan.java",
-    "src/src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java",
-    "src/src/main/java/org/mockito/internal/matchers/Matches.java",
-    "src/src/main/java/org/mockito/internal/matchers/Not.java",
-    "src/src/main/java/org/mockito/internal/matchers/NotNull.java",
-    "src/src/main/java/org/mockito/internal/matchers/Null.java",
-    "src/src/main/java/org/mockito/internal/matchers/Or.java",
-    "src/src/main/java/org/mockito/internal/matchers/Same.java",
-    "src/src/main/java/org/mockito/internal/matchers/StartsWith.java",
-    "src/src/main/java/org/mockito/internal/matchers/VarargMatcher.java",
-    "src/src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java",
-    "src/src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java",
-    "src/src/main/java/org/mockito/internal/matchers/text/ArrayIterator.java",
-    "src/src/main/java/org/mockito/internal/matchers/text/FormattedText.java",
-    "src/src/main/java/org/mockito/internal/matchers/text/MatcherToString.java",
-    "src/src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java",
-    "src/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java",
-    "src/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java",
-    "src/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java",
-    "src/src/main/java/org/mockito/internal/progress/MockingProgress.java",
-    "src/src/main/java/org/mockito/internal/progress/MockingProgressImpl.java",
-    "src/src/main/java/org/mockito/internal/progress/NoOpStubbingListener.java",
-    "src/src/main/java/org/mockito/internal/progress/SequenceNumber.java",
-    "src/src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java",
-    "src/src/main/java/org/mockito/internal/reporting/Discrepancy.java",
-    "src/src/main/java/org/mockito/internal/reporting/Pluralizer.java",
-    "src/src/main/java/org/mockito/internal/reporting/PrintSettings.java",
-    "src/src/main/java/org/mockito/internal/reporting/SmartPrinter.java",
-    "src/src/main/java/org/mockito/internal/runners/RunnerFactory.java",
-    "src/src/main/java/org/mockito/internal/runners/RunnerImpl.java",
-    "src/src/main/java/org/mockito/internal/runners/SilentJUnitRunner.java",
-    "src/src/main/java/org/mockito/internal/runners/StrictRunner.java",
-    "src/src/main/java/org/mockito/internal/runners/UnnecessaryStubbingsReporter.java",
-    "src/src/main/java/org/mockito/internal/runners/util/FailureDetecter.java",
-    "src/src/main/java/org/mockito/internal/runners/util/FrameworkUsageValidator.java",
-    "src/src/main/java/org/mockito/internal/runners/util/RunnerProvider.java",
-    "src/src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java",
-    "src/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java",
-    "src/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java",
-    "src/src/main/java/org/mockito/internal/stubbing/InvocationContainer.java",
-    "src/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java",
-    "src/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java",
-    "src/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java",
-    "src/src/main/java/org/mockito/internal/stubbing/StubberImpl.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/AnswersValidator.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/MethodInfo.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/Returns.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java",
-    "src/src/main/java/org/mockito/internal/stubbing/answers/ThrowsExceptionClass.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java",
-    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java",
-    "src/src/main/java/org/mockito/internal/util/Checks.java",
-    "src/src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java",
-    "src/src/main/java/org/mockito/internal/util/Decamelizer.java",
-    "src/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java",
-    "src/src/main/java/org/mockito/internal/util/JavaEightUtil.java",
-    "src/src/main/java/org/mockito/internal/util/MockCreationValidator.java",
-    "src/src/main/java/org/mockito/internal/util/MockNameImpl.java",
-    "src/src/main/java/org/mockito/internal/util/MockUtil.java",
-    "src/src/main/java/org/mockito/internal/util/MockitoLogger.java",
-    "src/src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java",
-    "src/src/main/java/org/mockito/internal/util/Primitives.java",
-    "src/src/main/java/org/mockito/internal/util/RemoveFirstLine.java",
-    "src/src/main/java/org/mockito/internal/util/SimpleMockitoLogger.java",
-    "src/src/main/java/org/mockito/internal/util/StringJoiner.java",
-    "src/src/main/java/org/mockito/internal/util/Timer.java",
-    "src/src/main/java/org/mockito/internal/util/collections/ArrayUtils.java",
-    "src/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java",
-    "src/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java",
-    "src/src/main/java/org/mockito/internal/util/collections/IdentitySet.java",
-    "src/src/main/java/org/mockito/internal/util/collections/Iterables.java",
-    "src/src/main/java/org/mockito/internal/util/collections/ListUtil.java",
-    "src/src/main/java/org/mockito/internal/util/collections/Sets.java",
-    "src/src/main/java/org/mockito/internal/util/io/IOUtil.java",
-    "src/src/main/java/org/mockito/internal/util/junit/JUnitFailureHacker.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/AccessibilityChanger.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/Constructors.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/FieldCopier.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/FieldReader.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/FieldSetter.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/Fields.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/InstanceField.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java",
-    "src/src/main/java/org/mockito/internal/util/reflection/Whitebox.java",
-    "src/src/main/java/org/mockito/internal/verification/AtLeast.java",
-    "src/src/main/java/org/mockito/internal/verification/AtMost.java",
-    "src/src/main/java/org/mockito/internal/verification/Calls.java",
-    "src/src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java",
-    "src/src/main/java/org/mockito/internal/verification/Description.java",
-    "src/src/main/java/org/mockito/internal/verification/InOrderContextImpl.java",
-    "src/src/main/java/org/mockito/internal/verification/InOrderWrapper.java",
-    "src/src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java",
-    "src/src/main/java/org/mockito/internal/verification/NoMoreInteractions.java",
-    "src/src/main/java/org/mockito/internal/verification/Only.java",
-    "src/src/main/java/org/mockito/internal/verification/RegisteredInvocations.java",
-    "src/src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java",
-    "src/src/main/java/org/mockito/internal/verification/Times.java",
-    "src/src/main/java/org/mockito/internal/verification/VerificationDataImpl.java",
-    "src/src/main/java/org/mockito/internal/verification/VerificationModeFactory.java",
-    "src/src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java",
-    "src/src/main/java/org/mockito/internal/verification/api/InOrderContext.java",
-    "src/src/main/java/org/mockito/internal/verification/api/VerificationData.java",
-    "src/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java",
-    "src/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java",
-    "src/src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java",
-    "src/src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/NonGreedyNumberOfInvocationsInOrderChecker.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java",
-    "src/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderChecker.java",
-    "src/src/main/java/org/mockito/invocation/DescribedInvocation.java",
-    "src/src/main/java/org/mockito/invocation/Invocation.java",
-    "src/src/main/java/org/mockito/invocation/InvocationOnMock.java",
-    "src/src/main/java/org/mockito/invocation/Location.java",
-    "src/src/main/java/org/mockito/invocation/MockHandler.java",
+    "src/src/main/java/org/mockito/MockitoDebugger.java",
+    "src/src/main/java/org/mockito/CheckReturnValue.java",
+    "src/src/main/java/org/mockito/Mockito.java",
+    "src/src/main/java/org/mockito/plugins/InstantiatorProvider2.java",
+    "src/src/main/java/org/mockito/plugins/AnnotationEngine.java",
+    "src/src/main/java/org/mockito/plugins/MockMaker.java",
+    "src/src/main/java/org/mockito/plugins/MockitoPlugins.java",
+    "src/src/main/java/org/mockito/plugins/PluginSwitch.java",
+    "src/src/main/java/org/mockito/plugins/InstantiatorProvider.java",
+    "src/src/main/java/org/mockito/plugins/package-info.java",
+    "src/src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java",
+    "src/src/main/java/org/mockito/MockitoFramework.java",
+    "src/src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java",
+    "src/src/main/java/org/mockito/configuration/AnnotationEngine.java",
+    "src/src/main/java/org/mockito/configuration/package-info.java",
+    "src/src/main/java/org/mockito/configuration/IMockitoConfiguration.java",
     "src/src/main/java/org/mockito/invocation/StubInfo.java",
-    "src/src/main/java/org/mockito/junit/MockitoJUnit.java",
-    "src/src/main/java/org/mockito/junit/MockitoRule.java",
-    "src/src/main/java/org/mockito/junit/VerificationCollector.java",
-    "src/src/main/java/org/mockito/junit/VerificationCollectorImpl.java",
-    "src/src/main/java/org/mockito/listeners/InvocationListener.java",
-    "src/src/main/java/org/mockito/listeners/MethodInvocationReport.java",
-    "src/src/main/java/org/mockito/listeners/StubbingListener.java",
-    "src/src/main/java/org/mockito/mock/MockCreationSettings.java",
+    "src/src/main/java/org/mockito/invocation/Invocation.java",
+    "src/src/main/java/org/mockito/invocation/MatchableInvocation.java",
+    "src/src/main/java/org/mockito/invocation/Location.java",
+    "src/src/main/java/org/mockito/invocation/DescribedInvocation.java",
+    "src/src/main/java/org/mockito/invocation/package-info.java",
+    "src/src/main/java/org/mockito/invocation/InvocationContainer.java",
+    "src/src/main/java/org/mockito/invocation/MockHandler.java",
+    "src/src/main/java/org/mockito/invocation/InvocationFactory.java",
+    "src/src/main/java/org/mockito/invocation/InvocationOnMock.java",
     "src/src/main/java/org/mockito/mock/MockName.java",
     "src/src/main/java/org/mockito/mock/SerializableMode.java",
-    "src/src/main/java/org/mockito/plugins/InstantiatorProvider.java",
-    "src/src/main/java/org/mockito/plugins/MockMaker.java",
-    "src/src/main/java/org/mockito/plugins/PluginSwitch.java",
-    "src/src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java",
+    "src/src/main/java/org/mockito/mock/package-info.java",
+    "src/src/main/java/org/mockito/mock/MockCreationSettings.java",
+    "src/src/main/java/org/mockito/codegen/InjectionBase.java",
+    "src/src/main/java/org/mockito/ArgumentMatchers.java",
+    "src/src/main/java/org/mockito/BDDMockito.java",
+    "src/src/main/java/org/mockito/listeners/MockCreationListener.java",
+    "src/src/main/java/org/mockito/listeners/InvocationListener.java",
+    "src/src/main/java/org/mockito/listeners/MethodInvocationReport.java",
+    "src/src/main/java/org/mockito/listeners/VerificationStartedListener.java",
+    "src/src/main/java/org/mockito/listeners/MockitoListener.java",
+    "src/src/main/java/org/mockito/listeners/VerificationStartedEvent.java",
+    "src/src/main/java/org/mockito/listeners/package-info.java",
+    "src/src/main/java/org/mockito/listeners/VerificationListener.java",
+    "src/src/main/java/org/mockito/package-info.java",
+    "src/src/main/java/org/mockito/MockingDetails.java",
+    "src/src/main/java/org/mockito/MockitoSession.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/UnfinishedMockingSessionException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/NotAMockException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/RedundantListenerException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/PotentialStubbingProblem.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/package-info.java",
+    "src/src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java",
+    "src/src/main/java/org/mockito/exceptions/base/MockitoException.java",
+    "src/src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java",
+    "src/src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java",
+    "src/src/main/java/org/mockito/exceptions/base/MockitoInitializationException.java",
+    "src/src/main/java/org/mockito/exceptions/base/package-info.java",
+    "src/src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java",
+    "src/src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java",
+    "src/src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java",
+    "src/src/main/java/org/mockito/exceptions/verification/TooLittleActualInvocations.java",
+    "src/src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java",
+    "src/src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java",
+    "src/src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java",
+    "src/src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java",
+    "src/src/main/java/org/mockito/exceptions/verification/package-info.java",
+    "src/src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java",
+    "src/src/main/java/org/mockito/exceptions/verification/junit/package-info.java",
+    "src/src/main/java/org/mockito/exceptions/stacktrace/package-info.java",
+    "src/src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java",
+    "src/src/main/java/org/mockito/exceptions/package-info.java",
+    "src/src/main/java/org/mockito/Mock.java",
+    "src/src/main/java/org/mockito/MockitoAnnotations.java",
+    "src/src/main/java/org/mockito/Spy.java",
+    "src/src/main/java/org/mockito/AdditionalMatchers.java",
+    "src/src/main/java/org/mockito/junit/MockitoJUnit.java",
+    "src/src/main/java/org/mockito/junit/MockitoJUnitRunner.java",
+    "src/src/main/java/org/mockito/junit/MockitoRule.java",
+    "src/src/main/java/org/mockito/junit/package-info.java",
+    "src/src/main/java/org/mockito/junit/VerificationCollector.java",
+    "src/src/main/java/org/mockito/Incubating.java",
+    "src/src/main/java/org/mockito/ArgumentCaptor.java",
+    "src/src/main/java/org/mockito/session/MockitoSessionLogger.java",
+    "src/src/main/java/org/mockito/session/MockitoSessionBuilder.java",
+    "src/src/main/java/org/mockito/InOrder.java",
     "src/src/main/java/org/mockito/runners/ConsoleSpammingMockitoJUnitRunner.java",
     "src/src/main/java/org/mockito/runners/MockitoJUnitRunner.java",
     "src/src/main/java/org/mockito/runners/VerboseMockitoJUnitRunner.java",
-    "src/src/main/java/org/mockito/stubbing/Answer.java",
-    "src/src/main/java/org/mockito/stubbing/OngoingStubbing.java",
-    "src/src/main/java/org/mockito/stubbing/Stubber.java",
-    "src/src/main/java/org/mockito/verification/After.java",
-    "src/src/main/java/org/mockito/verification/Timeout.java",
-    "src/src/main/java/org/mockito/verification/VerificationAfterDelay.java",
-    "src/src/main/java/org/mockito/verification/VerificationMode.java",
-    "src/src/main/java/org/mockito/verification/VerificationStrategy.java",
-    "src/src/main/java/org/mockito/verification/VerificationWithTimeout.java",
-    "src/src/main/java/org/mockito/verification/VerificationWrapper.java",
-    "src/src/main/java/org/mockito/verification/VerificationWrapperInOrderWrapper.java",
+    "src/src/main/java/org/mockito/runners/package-info.java",
+    "src/src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java",
+    "src/src/main/java/org/mockito/internal/verification/argumentmatching/package-info.java",
+    "src/src/main/java/org/mockito/internal/verification/Calls.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java",
+    "src/src/main/java/org/mockito/internal/verification/AtLeast.java",
+    "src/src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java",
+    "src/src/main/java/org/mockito/internal/verification/InOrderWrapper.java",
+    "src/src/main/java/org/mockito/internal/verification/InOrderContextImpl.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationEventImpl.java",
+    "src/src/main/java/org/mockito/internal/verification/NoMoreInteractions.java",
+    "src/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java",
+    "src/src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java",
+    "src/src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java",
+    "src/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java",
+    "src/src/main/java/org/mockito/internal/verification/checkers/package-info.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationWrapper.java",
+    "src/src/main/java/org/mockito/internal/verification/Description.java",
+    "src/src/main/java/org/mockito/internal/verification/package-info.java",
+    "src/src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java",
+    "src/src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java",
+    "src/src/main/java/org/mockito/internal/verification/RegisteredInvocations.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationDataImpl.java",
+    "src/src/main/java/org/mockito/internal/verification/Only.java",
+    "src/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java",
+    "src/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java",
+    "src/src/main/java/org/mockito/internal/verification/api/InOrderContext.java",
+    "src/src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java",
+    "src/src/main/java/org/mockito/internal/verification/api/package-info.java",
+    "src/src/main/java/org/mockito/internal/verification/api/VerificationData.java",
+    "src/src/main/java/org/mockito/internal/verification/Times.java",
+    "src/src/main/java/org/mockito/internal/verification/VerificationModeFactory.java",
+    "src/src/main/java/org/mockito/internal/verification/AtMost.java",
+    "src/src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java",
+    "src/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java",
+    "src/src/main/java/org/mockito/internal/util/io/IOUtil.java",
+    "src/src/main/java/org/mockito/internal/util/Checks.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/FieldReader.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/FieldCopier.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/package-info.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/InstanceField.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/Fields.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/FieldSetter.java",
+    "src/src/main/java/org/mockito/internal/util/reflection/AccessibilityChanger.java",
+    "src/src/main/java/org/mockito/internal/util/Primitives.java",
+    "src/src/main/java/org/mockito/internal/util/MockUtil.java",
+    "src/src/main/java/org/mockito/internal/util/MockNameImpl.java",
+    "src/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java",
+    "src/src/main/java/org/mockito/internal/util/collections/IdentitySet.java",
+    "src/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java",
+    "src/src/main/java/org/mockito/internal/util/collections/Sets.java",
+    "src/src/main/java/org/mockito/internal/util/collections/Iterables.java",
+    "src/src/main/java/org/mockito/internal/util/collections/ListUtil.java",
+    "src/src/main/java/org/mockito/internal/util/StringUtil.java",
+    "src/src/main/java/org/mockito/internal/util/concurrent/DetachedThreadLocal.java",
+    "src/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentSet.java",
+    "src/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java",
+    "src/src/main/java/org/mockito/internal/util/Supplier.java",
+    "src/src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java",
+    "src/src/main/java/org/mockito/internal/util/MockitoLogger.java",
+    "src/src/main/java/org/mockito/internal/util/MockCreationValidator.java",
+    "src/src/main/java/org/mockito/internal/util/Timer.java",
+    "src/src/main/java/org/mockito/internal/util/Platform.java",
+    "src/src/main/java/org/mockito/internal/util/JavaEightUtil.java",
+    "src/src/main/java/org/mockito/internal/util/package-info.java",
+    "src/src/main/java/org/mockito/internal/stubbing/StubbingComparator.java",
+    "src/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java",
+    "src/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/package-info.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java",
+    "src/src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java",
+    "src/src/main/java/org/mockito/internal/stubbing/StubberImpl.java",
+    "src/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/package-info.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/Returns.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidator.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java",
+    "src/src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java",
+    "src/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java",
+    "src/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java",
+    "src/src/main/java/org/mockito/internal/stubbing/package-info.java",
+    "src/src/main/java/org/mockito/internal/InternalMockHandler.java",
+    "src/src/main/java/org/mockito/internal/matchers/Same.java",
+    "src/src/main/java/org/mockito/internal/matchers/ArrayEquals.java",
+    "src/src/main/java/org/mockito/internal/matchers/CapturingMatcher.java",
+    "src/src/main/java/org/mockito/internal/matchers/Not.java",
+    "src/src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java",
+    "src/src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java",
+    "src/src/main/java/org/mockito/internal/matchers/apachecommons/package-info.java",
+    "src/src/main/java/org/mockito/internal/matchers/Equality.java",
+    "src/src/main/java/org/mockito/internal/matchers/CapturesArguments.java",
+    "src/src/main/java/org/mockito/internal/matchers/StartsWith.java",
+    "src/src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java",
+    "src/src/main/java/org/mockito/internal/matchers/Null.java",
+    "src/src/main/java/org/mockito/internal/matchers/NotNull.java",
+    "src/src/main/java/org/mockito/internal/matchers/CompareEqual.java",
+    "src/src/main/java/org/mockito/internal/matchers/Equals.java",
+    "src/src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java",
+    "src/src/main/java/org/mockito/internal/matchers/CompareTo.java",
+    "src/src/main/java/org/mockito/internal/matchers/InstanceOf.java",
+    "src/src/main/java/org/mockito/internal/matchers/VarargMatcher.java",
+    "src/src/main/java/org/mockito/internal/matchers/And.java",
+    "src/src/main/java/org/mockito/internal/matchers/Find.java",
+    "src/src/main/java/org/mockito/internal/matchers/Or.java",
+    "src/src/main/java/org/mockito/internal/matchers/text/MatcherToString.java",
+    "src/src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java",
+    "src/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java",
+    "src/src/main/java/org/mockito/internal/matchers/text/FormattedText.java",
+    "src/src/main/java/org/mockito/internal/matchers/LessThan.java",
+    "src/src/main/java/org/mockito/internal/matchers/EndsWith.java",
+    "src/src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java",
+    "src/src/main/java/org/mockito/internal/matchers/GreaterThan.java",
+    "src/src/main/java/org/mockito/internal/matchers/Any.java",
+    "src/src/main/java/org/mockito/internal/matchers/package-info.java",
+    "src/src/main/java/org/mockito/internal/matchers/LessOrEqual.java",
+    "src/src/main/java/org/mockito/internal/matchers/Matches.java",
+    "src/src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java",
+    "src/src/main/java/org/mockito/internal/matchers/Contains.java",
+    "src/src/main/java/org/mockito/internal/InOrderImpl.java",
+    "src/src/main/java/org/mockito/internal/MockitoCore.java",
+    "src/src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java",
+    "src/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java",
+    "src/src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java",
+    "src/src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java",
+    "src/src/main/java/org/mockito/internal/handler/MockHandlerFactory.java",
+    "src/src/main/java/org/mockito/internal/handler/NullResultGuardian.java",
+    "src/src/main/java/org/mockito/internal/handler/NotifiedMethodInvocationReport.java",
+    "src/src/main/java/org/mockito/internal/handler/MockHandlerImpl.java",
+    "src/src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java",
+    "src/src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java",
+    "src/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java",
+    "src/src/main/java/org/mockito/internal/progress/SequenceNumber.java",
+    "src/src/main/java/org/mockito/internal/progress/MockingProgress.java",
+    "src/src/main/java/org/mockito/internal/progress/package-info.java",
+    "src/src/main/java/org/mockito/internal/progress/MockingProgressImpl.java",
+    "src/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java",
+    "src/src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/MockInjection.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java",
+    "src/src/main/java/org/mockito/internal/configuration/injection/package-info.java",
+    "src/src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java",
+    "src/src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java",
+    "src/src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java",
+    "src/src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java",
+    "src/src/main/java/org/mockito/internal/configuration/IndependentAnnotationEngine.java",
+    "src/src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/Plugins.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java",
+    "src/src/main/java/org/mockito/internal/configuration/plugins/package-info.java",
+    "src/src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java",
+    "src/src/main/java/org/mockito/internal/configuration/ClassPathLoader.java",
+    "src/src/main/java/org/mockito/internal/configuration/package-info.java",
+    "src/src/main/java/org/mockito/internal/invocation/InvocationMarker.java",
+    "src/src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java",
+    "src/src/main/java/org/mockito/internal/invocation/StubInfoImpl.java",
+    "src/src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java",
+    "src/src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java",
+    "src/src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java",
+    "src/src/main/java/org/mockito/internal/invocation/InvocationComparator.java",
+    "src/src/main/java/org/mockito/internal/invocation/TypeSafeMatching.java",
+    "src/src/main/java/org/mockito/internal/invocation/MatchersBinder.java",
+    "src/src/main/java/org/mockito/internal/invocation/RealMethod.java",
+    "src/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java",
+    "src/src/main/java/org/mockito/internal/invocation/ArgumentMatcherAction.java",
+    "src/src/main/java/org/mockito/internal/invocation/InvocationsFinder.java",
+    "src/src/main/java/org/mockito/internal/invocation/SerializableMethod.java",
+    "src/src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java",
+    "src/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java",
+    "src/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java",
+    "src/src/main/java/org/mockito/internal/invocation/mockref/MockReference.java",
+    "src/src/main/java/org/mockito/internal/invocation/mockref/MockStrongReference.java",
+    "src/src/main/java/org/mockito/internal/invocation/mockref/MockWeakReference.java",
+    "src/src/main/java/org/mockito/internal/invocation/package-info.java",
+    "src/src/main/java/org/mockito/internal/invocation/UnusedStubsFinder.java",
+    "src/src/main/java/org/mockito/internal/invocation/MockitoMethod.java",
+    "src/src/main/java/org/mockito/internal/listeners/VerificationStartedNotifier.java",
+    "src/src/main/java/org/mockito/internal/listeners/StubbingLookupListener.java",
+    "src/src/main/java/org/mockito/internal/package-info.java",
+    "src/src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java",
+    "src/src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java",
+    "src/src/main/java/org/mockito/internal/exceptions/Reporter.java",
+    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java",
+    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java",
+    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java",
+    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/package-info.java",
+    "src/src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java",
+    "src/src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java",
+    "src/src/main/java/org/mockito/internal/debugging/WarningsFinder.java",
+    "src/src/main/java/org/mockito/internal/debugging/LoggingListener.java",
+    "src/src/main/java/org/mockito/internal/debugging/LocationImpl.java",
+    "src/src/main/java/org/mockito/internal/debugging/MockitoDebuggerImpl.java",
+    "src/src/main/java/org/mockito/internal/debugging/Localized.java",
+    "src/src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java",
+    "src/src/main/java/org/mockito/internal/debugging/WarningsCollector.java",
+    "src/src/main/java/org/mockito/internal/debugging/package-info.java",
+    "src/src/main/java/org/mockito/internal/debugging/InvocationsPrinter.java",
+    "src/src/main/java/org/mockito/internal/debugging/FindingsListener.java",
+    "src/src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java",
+    "src/src/main/java/org/mockito/internal/junit/ArgMismatchFinder.java",
+    "src/src/main/java/org/mockito/internal/junit/UnusedStubbings.java",
+    "src/src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java",
+    "src/src/main/java/org/mockito/internal/junit/JUnitRule.java",
+    "src/src/main/java/org/mockito/internal/junit/ExceptionFactory.java",
+    "src/src/main/java/org/mockito/internal/junit/util/JUnitFailureHacker.java",
+    "src/src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java",
+    "src/src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java",
+    "src/src/main/java/org/mockito/internal/junit/UnusedStubbingsFinder.java",
+    "src/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java",
+    "src/src/main/java/org/mockito/internal/junit/DefaultTestFinishedEvent.java",
+    "src/src/main/java/org/mockito/internal/junit/MockitoTestListener.java",
+    "src/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java",
+    "src/src/main/java/org/mockito/internal/junit/NoOpTestListener.java",
+    "src/src/main/java/org/mockito/internal/junit/UnnecessaryStubbingsReporter.java",
+    "src/src/main/java/org/mockito/internal/junit/StubbingHint.java",
+    "src/src/main/java/org/mockito/internal/junit/package-info.java",
+    "src/src/main/java/org/mockito/internal/junit/TestFinishedEvent.java",
+    "src/src/main/java/org/mockito/internal/junit/UniversalTestListener.java",
+    "src/src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java",
+    "src/src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java",
+    "src/src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java",
+    "src/src/main/java/org/mockito/internal/reporting/PrintSettings.java",
+    "src/src/main/java/org/mockito/internal/reporting/Pluralizer.java",
+    "src/src/main/java/org/mockito/internal/reporting/SmartPrinter.java",
+    "src/src/main/java/org/mockito/internal/reporting/Discrepancy.java",
+    "src/src/main/java/org/mockito/internal/reporting/package-info.java",
+    "src/src/main/java/org/mockito/internal/runners/util/RunnerProvider.java",
+    "src/src/main/java/org/mockito/internal/runners/util/FailureDetector.java",
+    "src/src/main/java/org/mockito/internal/runners/util/package-info.java",
+    "src/src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java",
+    "src/src/main/java/org/mockito/internal/runners/InternalRunner.java",
+    "src/src/main/java/org/mockito/internal/runners/RunnerFactory.java",
+    "src/src/main/java/org/mockito/internal/runners/StrictRunner.java",
+    "src/src/main/java/org/mockito/internal/runners/package-info.java",
+    "src/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java",
+    "src/src/main/java/org/mockito/internal/creation/DelegatingMethod.java",
+    "src/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java",
+    "src/src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java",
+    "src/src/main/java/org/mockito/internal/creation/util/package-info.java",
+    "src/src/main/java/org/mockito/internal/creation/MockSettingsImpl.java",
+    "src/src/main/java/org/mockito/internal/creation/SuspendMethod.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/InstantiationException.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/InstantiatorProvider2Adapter.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/Instantiator.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/InstantiatorProviderAdapter.java",
+    "src/src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/ClassCreatingMockMaker.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodDispatcher.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockAccess.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/package-info.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java",
+    "src/src/main/java/org/mockito/internal/creation/bytebuddy/BytecodeGenerator.java",
+    "src/src/main/java/org/mockito/internal/creation/package-info.java",
+    "src/src/main/java/org/mockito/creation/instance/InstantiationException.java",
+    "src/src/main/java/org/mockito/creation/instance/Instantiator.java",
   ]
 }
+
+android_library("mockito_android_java") {
+  chromium_code = false
+  testonly = true
+  proguard_configs = [ "//third_party/mockito/proguard.flags" ]
+  deps = [
+    ":mockito_java",
+    "//third_party/byte_buddy:byte_buddy_android_java",
+  ]
+
+  java_files = [
+    "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java",
+    "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidLoadingStrategy.java",
+    "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidByteBuddyMockMaker.java",
+  ]
+
+  include_java_resources = true
+  additional_jar_files = [ [
+        rebase_path(
+            "src/subprojects/android/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker"),
+        "mockito-extensions/org.mockito.plugins.MockMaker",
+      ] ]
+}
diff --git a/third_party/mockito/README.chromium b/third_party/mockito/README.chromium
index 99d8988..33bd030 100644
--- a/third_party/mockito/README.chromium
+++ b/third_party/mockito/README.chromium
@@ -1,6 +1,6 @@
 Name: Mockito
 URL: https://github.com/mockito/mockito
-Version: v2.0.99-beta
+Version: v2.18.3
 License: MIT
 License File: NOT_SHIPPED
 Security Critical: no
diff --git a/third_party/mockito/proguard.flags b/third_party/mockito/proguard.flags
new file mode 100644
index 0000000..592aea1
--- /dev/null
+++ b/third_party/mockito/proguard.flags
@@ -0,0 +1,11 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+-dontwarn org.mockito.**
+
+# Mockito loads some things by reflection. Prevent proguard from
+# obfuscating or removing anything to ensure that doesn't break.
+-keep class org.mockito.** {
+  *;
+}
diff --git a/third_party/objenesis/BUILD.gn b/third_party/objenesis/BUILD.gn
index dcb41b6..21db97e 100644
--- a/third_party/objenesis/BUILD.gn
+++ b/third_party/objenesis/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/android/rules.gni")
 
 java_prebuilt("objenesis_java") {
+  supports_android = true
   testonly = true
   jar_path = "lib/objenesis.jar"
 }