Skip to content

Commit 5906aaf

Browse files
AlexkunAlexkun
committed
更新junit为junit5
1 parent 9b208c1 commit 5906aaf

File tree

15 files changed

+50
-27
lines changed

15 files changed

+50
-27
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ streamis-appconn/target
3131
/streamis-jobmanager/streamis-job-errorcode/target/
3232
/streamis-jobmanager/streamis-job-audit-log/target/
3333
**/.flattened-pom.xml
34-
*.patch
34+
*.patch
35+
.vscode

‎pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<properties>
4848
<revision>0.4.2-wedatasphere-SNAPSHOT</revision>
4949
<linkis.version>1.12.0-wds</linkis.version>
50-
<junit.version>4.12</junit.version>
50+
<junit.version>5.13.3</junit.version>
5151
<dss.version>1.12.0-SNAPSHOT</dss.version>
5252
<scala.version>2.11.12</scala.version>
5353
<jdk.compile.version>1.8</jdk.compile.version>
@@ -186,6 +186,30 @@
186186
<artifactId>commons-beanutils</artifactId>
187187
<version>${commons-beanutils.version}</version>
188188
</dependency>
189+
<dependency>
190+
<groupId>org.junit.jupiter</groupId>
191+
<artifactId>junit-jupiter-api</artifactId>
192+
<version>${junit.version}</version>
193+
<scope>test</scope>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.junit.jupiter</groupId>
197+
<artifactId>junit-jupiter-engine</artifactId>
198+
<version>${junit.version}</version>
199+
<scope>test</scope>
200+
</dependency>
201+
<dependency>
202+
<groupId>org.junit.jupiter</groupId>
203+
<artifactId>junit-jupiter-params</artifactId>
204+
<version>${junit.version}</version>
205+
<scope>test</scope>
206+
</dependency>
207+
<dependency>
208+
<groupId>org.junit.vintage</groupId>
209+
<artifactId>junit-vintage-engine</artifactId>
210+
<version>${junit.version}</version>
211+
<scope>test</scope>
212+
</dependency>
189213
</dependencies>
190214
</dependencyManagement>
191215

‎streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-common/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<version>${project.version}</version>
5454
</dependency>
5555
<dependency>
56-
<groupId>junit</groupId>
57-
<artifactId>junit</artifactId>
58-
<version>4.13.2</version>
56+
<groupId>org.junit.jupiter</groupId>
57+
<artifactId>junit-jupiter-api</artifactId>
58+
<version>${junit.version}</version>
5959
<scope>test</scope>
6060
</dependency>
6161
</dependencies>

‎streamis-jobmanager/streamis-job-errorcode/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
</dependency>
5353
<dependency>
5454
<groupId>org.junit.jupiter</groupId>
55-
<artifactId>junit-jupiter</artifactId>
56-
<version>RELEASE</version>
55+
<artifactId>junit-jupiter-api</artifactId>
56+
<version>${junit.version}</version>
5757
<scope>test</scope>
5858
</dependency>
5959

‎streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
</dependency>
4242
<!--Junit-->
4343
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit</artifactId>
44+
<groupId>org.junit.jupiter</groupId>
45+
<artifactId>junit-jupiter-api</artifactId>
4646
<version>${junit.version}</version>
4747
<scope>test</scope>
4848
</dependency>

‎streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/src/test/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/flink/FlinkConfigurationLoadTest.java‎

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

33
import org.apache.flink.configuration.Configuration;
44
import org.apache.flink.configuration.GlobalConfiguration;
5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import java.util.Enumeration;
88
import java.util.Objects;

‎streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
</dependency>
5656

5757
<dependency>
58-
<groupId>junit</groupId>
59-
<artifactId>junit</artifactId>
58+
<groupId>org.junit.jupiter</groupId>
59+
<artifactId>junit-jupiter-api</artifactId>
6060
<version>${junit.version}</version>
6161
<scope>test</scope>
6262
</dependency>

‎streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector/src/test/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/StreamisLogAppenderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.webank.wedatasphere.streamis.jobmanager.log.collector;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44
import org.slf4j.Logger;
55
import org.slf4j.LoggerFactory;
66

‎streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector1x/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</dependency>
4848

4949
<dependency>
50-
<groupId>junit</groupId>
51-
<artifactId>junit</artifactId>
50+
<groupId>org.junit.jupiter</groupId>
51+
<artifactId>junit-jupiter-api</artifactId>
5252
<version>${junit.version}</version>
5353
<scope>test</scope>
5454
</dependency>

‎streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector1x/src/test/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/StreamisLogAppenderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.webank.wedatasphere.streamis.jobmanager.log.collector;
22

33
import org.apache.log4j.PropertyConfigurator;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

0 commit comments

Comments
 (0)