This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1abdf72dca0 HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - HDFS
Part1. (#7865)
1abdf72dca0 is described below
commit 1abdf72dca0c530c265859362b2a2d574d8c9d72
Author: slfan1989 <[email protected]>
AuthorDate: Fri Aug 15 08:38:01 2025 +0800
HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - HDFS Part1. (#7865)
* HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - HDFS Part1.
Co-authored-by: Chris Nauroth <[email protected]>
Co-authored-by: Hualong Zhang <[email protected]>
Reviewed-by: Chris Nauroth <[email protected]>
Reviewed-by: Hualong Zhang <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>
---
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 10 ----------
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 5 -----
hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml | 10 ----------
hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 10 ----------
hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 10 ----------
.../federation/router/TestRouterMountTableCacheRefresh.java | 5 +++++
6 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index 9526ac8fd07..be213dbc4dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -64,11 +64,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
@@ -148,11 +143,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 6607a2a300c..3f5d1e6a7b6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -42,11 +42,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
index ef4df0713c3..404e398cceb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
@@ -72,11 +72,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -97,11 +92,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
index 277e90fbf30..6989bbe9ae8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -153,11 +153,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
@@ -193,11 +188,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index 70e79690ae0..1ba57344ddc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -121,11 +121,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@@ -187,11 +182,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTableCacheRefresh.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTableCacheRefresh.java
index 34242f5c8ad..373743299f0 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTableCacheRefresh.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTableCacheRefresh.java
@@ -117,6 +117,11 @@ public void destroy() {
}
} catch (IOException e) {
// do nothing
+ } finally {
+ cluster = null;
+ routerContext = null;
+ mountTableManager = null;
+ curatorTestingServer = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
