Skip to content

Commit 1abdf72

Browse files
slfan1989cnaurothzhtttylz
authored
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]>
1 parent 5bd8b2a commit 1abdf72

File tree

6 files changed

+5
-45
lines changed

6 files changed

+5
-45
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
6464
<artifactId>jakarta.ws.rs-api</artifactId>
6565
<scope>compile</scope>
6666
</dependency>
67-
<dependency>
68-
<groupId>junit</groupId>
69-
<artifactId>junit</artifactId>
70-
<scope>test</scope>
71-
</dependency>
7267
<dependency>
7368
<groupId>org.mockito</groupId>
7469
<artifactId>mockito-inline</artifactId>
@@ -148,11 +143,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
148143
<artifactId>junit-platform-launcher</artifactId>
149144
<scope>test</scope>
150145
</dependency>
151-
<dependency>
152-
<groupId>org.junit.vintage</groupId>
153-
<artifactId>junit-vintage-engine</artifactId>
154-
<scope>test</scope>
155-
</dependency>
156146
</dependencies>
157147

158148
<build>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
</properties>
4343

4444
<dependencies>
45-
<dependency>
46-
<groupId>junit</groupId>
47-
<artifactId>junit</artifactId>
48-
<scope>test</scope>
49-
</dependency>
5045
<dependency>
5146
<groupId>org.mockito</groupId>
5247
<artifactId>mockito-inline</artifactId>

hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
7272
<artifactId>mockito-inline</artifactId>
7373
<scope>test</scope>
7474
</dependency>
75-
<dependency>
76-
<groupId>junit</groupId>
77-
<artifactId>junit</artifactId>
78-
<scope>test</scope>
79-
</dependency>
8075
<dependency>
8176
<groupId>org.junit.jupiter</groupId>
8277
<artifactId>junit-jupiter-api</artifactId>
@@ -97,11 +92,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
9792
<artifactId>junit-platform-launcher</artifactId>
9893
<scope>test</scope>
9994
</dependency>
100-
<dependency>
101-
<groupId>org.junit.vintage</groupId>
102-
<artifactId>junit-vintage-engine</artifactId>
103-
<scope>test</scope>
104-
</dependency>
10595
</dependencies>
10696

10797
<build>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
153153
<artifactId>jakarta.servlet-api</artifactId>
154154
<scope>compile</scope>
155155
</dependency>
156-
<dependency>
157-
<groupId>junit</groupId>
158-
<artifactId>junit</artifactId>
159-
<scope>test</scope>
160-
</dependency>
161156
<dependency>
162157
<groupId>org.mockito</groupId>
163158
<artifactId>mockito-inline</artifactId>
@@ -193,11 +188,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
193188
<artifactId>junit-jupiter-engine</artifactId>
194189
<scope>test</scope>
195190
</dependency>
196-
<dependency>
197-
<groupId>org.junit.vintage</groupId>
198-
<artifactId>junit-vintage-engine</artifactId>
199-
<scope>test</scope>
200-
</dependency>
201191
<dependency>
202192
<groupId>org.junit.platform</groupId>
203193
<artifactId>junit-platform-launcher</artifactId>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
121121
<groupId>com.zaxxer</groupId>
122122
<artifactId>HikariCP</artifactId>
123123
</dependency>
124-
<dependency>
125-
<groupId>junit</groupId>
126-
<artifactId>junit</artifactId>
127-
<scope>test</scope>
128-
</dependency>
129124
<dependency>
130125
<groupId>org.apache.hadoop</groupId>
131126
<artifactId>hadoop-hdfs</artifactId>
@@ -187,11 +182,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
187182
<artifactId>junit-jupiter-engine</artifactId>
188183
<scope>test</scope>
189184
</dependency>
190-
<dependency>
191-
<groupId>org.junit.vintage</groupId>
192-
<artifactId>junit-vintage-engine</artifactId>
193-
<scope>test</scope>
194-
</dependency>
195185
<dependency>
196186
<groupId>org.junit.platform</groupId>
197187
<artifactId>junit-platform-launcher</artifactId>

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTableCacheRefresh.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ public void destroy() {
117117
}
118118
} catch (IOException e) {
119119
// do nothing
120+
} finally {
121+
cluster = null;
122+
routerContext = null;
123+
mountTableManager = null;
124+
curatorTestingServer = null;
120125
}
121126
}
122127

0 commit comments

Comments
 (0)