HADOOP-19692. Exclude junit 4 transitive dependency. (#7978)

Author: szetszwo

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

@@ -337,7 +337,7 @@
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>mockwebserver</artifactId>
+      <artifactId>mockwebserver3-junit5</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/http/TestHttpFileSystem.java

@@ -18,9 +18,9 @@
 
 package org.apache.hadoop.fs.http;
 
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
+import mockwebserver3.RecordedRequest;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -55,7 +55,8 @@ public void testHttpFileSystem() throws IOException, URISyntaxException,
       InterruptedException {
     final String data = "foo";
     try (MockWebServer server = new MockWebServer()) {
-      IntStream.rangeClosed(1, 3).forEach(i -> server.enqueue(new MockResponse().setBody(data)));
+      final MockResponse response = new MockResponse.Builder().body(data).build();
+      IntStream.rangeClosed(1, 3).forEach(i -> server.enqueue(response));
       server.start();
       URI uri = URI.create(String.format("http://%s:%d", server.getHostName(),
           server.getPort()));
@@ -64,7 +65,7 @@ public void testHttpFileSystem() throws IOException, URISyntaxException,
       assertSameData(fs, new Path("/foo"), data);
       assertSameData(fs, new Path("foo"), data);
       RecordedRequest req = server.takeRequest();
-      assertEquals("/foo", req.getPath());
+      assertEquals("/foo", req.getUrl().encodedPath());
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml

@@ -200,11 +200,6 @@
       <artifactId>bcprov-jdk18on</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>mockwebserver</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>

hadoop-project/pom.xml

@@ -140,7 +140,7 @@
     <hikari.version>4.0.3</hikari.version>
     <derby.version>10.14.2.0</derby.version>
     <mssql.version>6.2.1.jre7</mssql.version>
-    <okhttp3.version>4.11.0</okhttp3.version>
+    <okhttp3.version>5.1.0</okhttp3.version>
     <kotlin-stdlib.version>1.6.20</kotlin-stdlib.version>
     <jdom2.version>2.0.6.1</jdom2.version>
     <jna.version>5.2.0</jna.version>
@@ -256,7 +256,7 @@
     <dependencies>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>mockwebserver</artifactId>
+        <artifactId>mockwebserver3-junit5</artifactId>
         <version>${okhttp3.version}</version>
         <scope>test</scope>
         <exclusions>
@@ -1392,6 +1392,12 @@
         <groupId>com.googlecode.json-simple</groupId>
         <artifactId>json-simple</artifactId>
         <version>1.1.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>