From 6c15124d6f24a83237aa4654148e6e51d657ccba Mon Sep 17 00:00:00 2001
From: Tsz-Wo Nicholas Sze <szetszwo@apache.org>
Date: Mon, 7 Oct 2024 09:12:29 -0700
Subject: [PATCH] Revert pom.xml changes.

---
 pom.xml                                                   | 8 ++++----
 .../java/org/apache/ratis/util/DataBlockingQueue.java     | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21483043f2..94f3a7d99f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
     <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
     <maven-clover2-plugin.version>4.0.6</maven-clover2-plugin.version>
     <maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
-    <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
     <wagon-ssh.version>3.5.3</wagon-ssh.version>
     <hadoop-maven-plugins.version>3.4.0</hadoop-maven-plugins.version>
 
@@ -223,8 +223,8 @@
     <testsThreadCount>4</testsThreadCount>
 
     <slf4j.version>2.0.7</slf4j.version>
-    <junit-bom.version>5.11.2</junit-bom.version>
-    <jacoco.version>0.8.12</jacoco.version>
+    <junit.jupiter.version>5.10.1</junit.jupiter.version>
+    <jacoco.version>0.8.11</jacoco.version>
   </properties>
 
   <dependencyManagement>
@@ -427,7 +427,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>${junit-bom.version}</version>
+        <version>${junit.jupiter.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/DataBlockingQueue.java b/ratis-common/src/main/java/org/apache/ratis/util/DataBlockingQueue.java
index 4651bcf230..fb0f0715c5 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/DataBlockingQueue.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/DataBlockingQueue.java
@@ -75,6 +75,7 @@ public void clear() {
     }
   }
 
+  /** Apply the given handler to each element and then {@link #clear()}. */
   public void clear(Consumer<E> handler) {
     try(AutoCloseableLock auto = AutoCloseableLock.acquire(lock)) {
       for(E e : this) {
@@ -84,8 +85,13 @@ public void clear(Consumer<E> handler) {
     }
   }
 
+  /**
+   * Close this queue to stop accepting new elements, i.e. the offer(…) methods always return false.
+   * Note that closing the queue will not clear the existing elements.
+   * The existing elements can be peeked, polled or cleared after close.
+   */
   public void close() {
-    try(AutoCloseableLock auto = AutoCloseableLock.acquire(lock)) {
+    try(AutoCloseableLock ignored = AutoCloseableLock.acquire(lock)) {
       closed = true;
     }
   }