Skip to content

Commit 648c0ef

Browse files
slfan1989cnauroth
andauthored
HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - MapReduce. (#7799)
Co-authored-by: Chris Nauroth <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
1 parent 1c7cda7 commit 648c0ef

File tree

11 files changed

+5
-40
lines changed

11 files changed

+5
-40
lines changed

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@
168168
<artifactId>junit-platform-launcher</artifactId>
169169
<scope>test</scope>
170170
</dependency>
171-
<dependency>
172-
<groupId>org.junit.vintage</groupId>
173-
<artifactId>junit-vintage-engine</artifactId>
174-
<scope>test</scope>
175-
</dependency>
176171
<dependency>
177172
<groupId>org.mockito</groupId>
178173
<artifactId>mockito-junit-jupiter</artifactId>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@
9292
<artifactId>junit-platform-launcher</artifactId>
9393
<scope>test</scope>
9494
</dependency>
95-
<dependency>
96-
<groupId>org.junit.vintage</groupId>
97-
<artifactId>junit-vintage-engine</artifactId>
98-
<scope>test</scope>
99-
</dependency>
10095
<dependency>
10196
<groupId>org.mockito</groupId>
10297
<artifactId>mockito-junit-jupiter</artifactId>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@
115115
<artifactId>junit-platform-launcher</artifactId>
116116
<scope>test</scope>
117117
</dependency>
118-
<dependency>
119-
<groupId>org.junit.vintage</groupId>
120-
<artifactId>junit-vintage-engine</artifactId>
121-
<scope>test</scope>
122-
</dependency>
123118
</dependencies>
124119

125120
<build>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
2222
import static org.junit.jupiter.api.Assertions.assertEquals;
23-
import static org.junit.Assert.fail;
23+
import static org.junit.jupiter.api.Assertions.fail;
2424
import static org.mockito.Mockito.mock;
2525

2626
import java.io.StringReader;

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@
148148
<artifactId>junit-platform-launcher</artifactId>
149149
<scope>test</scope>
150150
</dependency>
151-
<dependency>
152-
<groupId>org.junit.vintage</groupId>
153-
<artifactId>junit-vintage-engine</artifactId>
154-
<scope>test</scope>
155-
</dependency>
156151

157152
</dependencies>
158153

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@
8080
<artifactId>junit-platform-launcher</artifactId>
8181
<scope>test</scope>
8282
</dependency>
83-
<dependency>
84-
<groupId>org.junit.vintage</groupId>
85-
<artifactId>junit-vintage-engine</artifactId>
86-
<scope>test</scope>
87-
</dependency>
8883
</dependencies>
8984

9085
<build>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/serde/TestNativeSerialization.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.apache.hadoop.mapred.nativetask.INativeComparable;
2626
import org.junit.jupiter.api.Test;
2727

28-
import static org.junit.Assert.assertEquals;
29-
import static org.junit.Assert.assertTrue;
28+
import static org.junit.jupiter.api.Assertions.assertEquals;
29+
import static org.junit.jupiter.api.Assertions.assertTrue;
3030

3131
@SuppressWarnings({ "rawtypes" })
3232
public class TestNativeSerialization {

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/utils/TestBytesUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import org.apache.hadoop.mapred.nativetask.util.BytesUtil;
2626

27-
import static org.junit.Assert.assertEquals;
27+
import static org.junit.jupiter.api.Assertions.assertEquals;
2828

2929
public class TestBytesUtil {
3030

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
<artifactId>junit-platform-launcher</artifactId>
6767
<scope>test</scope>
6868
</dependency>
69-
<dependency>
70-
<groupId>org.junit.vintage</groupId>
71-
<artifactId>junit-vintage-engine</artifactId>
72-
<scope>test</scope>
73-
</dependency>
7469
</dependencies>
7570

7671
<build>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.junit.jupiter.api.Assertions.assertTrue;
3434
import static org.junit.jupiter.api.Assertions.assertEquals;
3535
import static org.junit.jupiter.api.Assertions.fail;
36-
import static org.junit.Assume.assumeTrue;
36+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
3737
import static org.mockito.Mockito.mock;
3838
import static org.mockito.Mockito.when;
3939

0 commit comments

Comments
 (0)