RATIS-1977. Improve Code.

Author: slfan1989

pom.xml

@@ -221,9 +221,8 @@
     <testsThreadCount>4</testsThreadCount>
 
     <slf4j.version>2.0.7</slf4j.version>
-    <junit-bom.version>5.11.2</junit-bom.version>
-    <mockito.version>4.3.1</mockito.version>
-    <tomcat.version>6.0.53</tomcat.version>
+    <junit-bom.version>5.12.2</junit-bom.version>
+    <mockito.version>4.11.0</mockito.version>
     <jacoco.version>0.8.12</jacoco.version>
     <flaky-test-groups>flaky | org.apache.ratis.test.tag.FlakyTest</flaky-test-groups>
   </properties>
@@ -431,12 +430,6 @@
         <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>annotations-api</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

ratis-common/src/test/java/org/apache/ratis/BaseTest.java

@@ -70,8 +70,6 @@ public void setFirstException(Throwable e) {
     }
   }
 
-  // TODO: Junit 4 reference should be removed once all the unit tests are migrated to Junit 5.
-
   private String testCaseName;
 
   @BeforeEach
@@ -127,7 +125,6 @@ public File getClassTestDir() {
   }
 
   public File getTestDir() {
-    // This will work for both junit 4 and 5.
     return new File(getClassTestDir(), testCaseName);
   }
 

ratis-proto/pom.xml

@@ -175,9 +175,5 @@
       <groupId>org.apache.ratis</groupId>
       <artifactId>ratis-thirdparty-misc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>annotations-api</artifactId>
-    </dependency>
   </dependencies>
 </project>