TEZ-4719: Move to Junit6

Author: Aggarwal-Raghav

.codespellrc

@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[codespell]
+ignore-words-list = thirdparty,afterall,AfterAll

hadoop-shim/pom.xml

@@ -34,8 +34,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-     <groupId>junit</groupId>
-     <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>

hadoop-shim/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShimsLoader.java

@@ -18,20 +18,24 @@
  */
 package org.apache.tez.hadoop.shim;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.tez.hadoop.shim.DummyShimProvider.DummyShim;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class TestHadoopShimsLoader {
 
   @Test
   public void testBasicLoader() {
     HadoopShimsLoader loader = new HadoopShimsLoader(new Configuration(false));
     HadoopShim shim = loader.getHadoopShim();
-    Assert.assertNotNull(shim);
-    Assert.assertEquals(DefaultHadoopShim.class, shim.getClass());
+    assertNotNull(shim);
+    assertEquals(DefaultHadoopShim.class, shim.getClass());
   }
 
   @Test
@@ -40,16 +44,19 @@ public void testLoaderOverride() {
     conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS, DummyShimProvider.class.getName());
     HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
     HadoopShim shim = loader.getHadoopShim();
-    Assert.assertNotNull(shim);
-    Assert.assertEquals(DummyShim.class, shim.getClass());
+    assertNotNull(shim);
+    assertEquals(DummyShim.class, shim.getClass());
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testInvalidOverride() {
     Configuration conf = new Configuration(false);
     conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS, "org.apache.tez.foo");
-    HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
-    HadoopShim shim = loader.getHadoopShim();
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
+          HadoopShim shim = loader.getHadoopShim();
+        });
   }
-
 }

pom.xml

@@ -85,8 +85,7 @@
     <jackson.version>2.18.6</jackson.version>
     <jersey.version>2.46</jersey.version>
     <jettison.version>1.5.4</jettison.version>
-    <junit.version>4.13.2</junit.version>
-    <junit.jupiter.version>5.9.3</junit.jupiter.version>
+    <junit.version>6.1.0</junit.version>
     <leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
     <leveldb.version>0.12</leveldb.version>
     <leveldbjni-all.version>1.8</leveldbjni-all.version>
@@ -629,8 +628,8 @@
         <version>${hadoop.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
           </exclusion>
           <exclusion>
             <groupId>com.google.inject</groupId>
@@ -890,22 +889,10 @@
         <artifactId>commons-cli</artifactId>
         <version>${commons-cli.version}</version>
       </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>${junit.jupiter.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit.jupiter.version}</version>
+        <artifactId>junit-jupiter</artifactId>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>

tez-api/pom.xml

@@ -90,8 +90,8 @@
      <artifactId>protobuf-java</artifactId>
     </dependency>
     <dependency>
-     <groupId>junit</groupId>
-     <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>