HADOOP-19677. [JDK17] Remove mockito-all 1.10.19 and powermock. (#7935)

Author: szetszwo

hadoop-common-project/hadoop-auth/pom.xml

@@ -44,7 +44,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

@@ -96,8 +96,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-
-      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

hadoop-project/pom.xml

@@ -239,7 +239,7 @@
     <junit.platform.version>1.13.3</junit.platform.version>
     <assertj.version>3.12.2</assertj.version>
     <jline.version>3.9.0</jline.version>
-    <powermock.version>2.0.9</powermock.version>
+    <mockito.version>4.11.0</mockito.version>
     <solr.version>8.11.2</solr.version>
     <openssl-wildfly.version>2.1.4.Final</openssl-wildfly.version>
     <jsonschema2pojo.version>1.0.2</jsonschema2pojo.version>
@@ -1308,22 +1308,27 @@
         <artifactId>byte-buddy-agent</artifactId>
         <version>${byte-buddy.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-inline</artifactId>
-        <version>4.11.0</version>
+        <version>${mockito.version}</version>
         <exclusions>
           <exclusion>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>1.10.19</version>
-      </dependency>
       <dependency>
         <groupId>org.objenesis</groupId>
         <artifactId>objenesis</artifactId>
@@ -1348,11 +1353,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-junit-jupiter</artifactId>
-        <version>4.11.0</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>

hadoop-tools/hadoop-azure/pom.xml

@@ -316,7 +316,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml

@@ -47,31 +47,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.11.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>${powermock.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-all</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>test</scope>
     </dependency>
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java

@@ -31,11 +31,9 @@
 
 import java.util.List;
 
-import static org.powermock.api.mockito.PowerMockito.when;
-import static org.powermock.api.support.membermodification.MemberMatcher.method;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit test for AppCatalogSolrClient.
@@ -55,8 +53,7 @@ public void setup() throws Exception {
     solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR,
         "exampleCollection");
     spy = Mockito.spy(new AppCatalogSolrClient());
-    when(spy, method(AppCatalogSolrClient.class, "getSolrClient"))
-        .withNoArguments().thenReturn(solrClient);
+    when(spy.getSolrClient()).thenReturn(solrClient);
   }
 
   @AfterEach

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml

@@ -74,7 +74,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGPGPolicyFacade.java

@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.globalpolicygenerator;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -49,7 +50,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -167,7 +167,7 @@ public void testOverwritePolicy() throws YarnException {
   public void testWriteCache() throws YarnException {
     stateStore = mock(MemoryFederationStateStore.class);
     facade.reinitialize(stateStore, conf);
-    when(stateStore.getPolicyConfiguration(Matchers.any(
+    when(stateStore.getPolicyConfiguration(any(
         GetSubClusterPolicyConfigurationRequest.class))).thenReturn(
         GetSubClusterPolicyConfigurationResponse.newInstance(testConf));
     policyFacade = new GPGPolicyFacade(facade, conf);
@@ -176,12 +176,12 @@ public void testWriteCache() throws YarnException {
     FederationPolicyManager manager = policyFacade.getPolicyManager(TEST_QUEUE);
     // State store should be contacted once
     verify(stateStore, times(1)).getPolicyConfiguration(
-        Matchers.any(GetSubClusterPolicyConfigurationRequest.class));
+        any(GetSubClusterPolicyConfigurationRequest.class));
 
     // If we set the same policy, the state store should be untouched
     policyFacade.setPolicyManager(manager);
     verify(stateStore, times(0)).setPolicyConfiguration(
-        Matchers.any(SetSubClusterPolicyConfigurationRequest.class));
+        any(SetSubClusterPolicyConfigurationRequest.class));
   }
 
   /**
@@ -192,7 +192,7 @@ public void testReadOnly() throws YarnException {
     conf.setBoolean(YarnConfiguration.GPG_POLICY_GENERATOR_READONLY, true);
     stateStore = mock(MemoryFederationStateStore.class);
     facade.reinitialize(stateStore, conf);
-    when(stateStore.getPolicyConfiguration(Matchers.any(
+    when(stateStore.getPolicyConfiguration(any(
         GetSubClusterPolicyConfigurationRequest.class))).thenReturn(
         GetSubClusterPolicyConfigurationResponse.newInstance(testConf));
     policyFacade = new GPGPolicyFacade(facade, conf);
@@ -208,7 +208,7 @@ public void testReadOnly() throws YarnException {
         GPGUtils.createUniformWeights(subClusterIds));
     policyFacade.setPolicyManager(manager);
     verify(stateStore, times(0)).setPolicyConfiguration(
-        Matchers.any(SetSubClusterPolicyConfigurationRequest.class));
+        any(SetSubClusterPolicyConfigurationRequest.class));
   }
 
   @Test

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestPolicyGenerator.java

@@ -72,8 +72,8 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml

@@ -60,7 +60,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
-      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->