diff --git a/buildtools/pom.xml b/buildtools/pom.xml index ccf2caaf4948e..b1508a28f23f5 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -50,7 +50,6 @@ 31.0.1-jre 1.10.12 1.30 - 3.12.4 --add-opens java.base/jdk.internal.loader=ALL-UNNAMED @@ -133,16 +132,6 @@ 4.1.77.Final test - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-inline - ${mockito.version} - diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java index 73fff1bb7e269..354a55c10e39f 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java @@ -18,7 +18,6 @@ */ package org.apache.pulsar.tests; -import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,22 +36,10 @@ public class MockitoCleanupListener extends BetweenTestClassesListenerAdapter { @Override protected void onBetweenTestClasses(Class endedTestClass, Class startedTestClass) { - if (MOCKITO_CLEANUP_ENABLED) { - if (MockitoThreadLocalStateCleaner.INSTANCE.isEnabled()) { - LOG.info("Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state."); - MockitoThreadLocalStateCleaner.INSTANCE.cleanup(); - } - cleanupMockitoInline(); + if (MOCKITO_CLEANUP_ENABLED && MockitoThreadLocalStateCleaner.INSTANCE.isEnabled()) { + LOG.info("Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state."); + MockitoThreadLocalStateCleaner.INSTANCE.cleanup(); } } - /** - * Mockito-inline can leak mocked objects, we need to clean up the inline mocks after every test. - * See - * mockito docs. - */ - private void cleanupMockitoInline() { - Mockito.framework().clearInlineMocks(); - } - }