Skip to content

Commit 3042629

Browse files
author
Dave Syer
committed
Remove obsolete excludes for junit vintage
1 parent 9fb26fa commit 3042629

File tree

8 files changed

+8
-67
lines changed

8 files changed

+8
-67
lines changed

docs/en/client/testing.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ For Maven add the following dependencies:
8686
<groupId>org.springframework.boot</groupId>
8787
<artifactId>spring-boot-starter-test</artifactId>
8888
<scope>test</scope>
89-
<!-- Exclude the test engine you don't need -->
90-
<exclusions>
91-
<exclusion>
92-
<groupId>org.junit.vintage</groupId>
93-
<artifactId>junit-vintage-engine</artifactId>
94-
</exclusion>
95-
</exclusions>
9689
</dependency>
9790
<!-- Mocking Framework (Optional) -->
9891
<dependency>
@@ -111,10 +104,7 @@ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
111104
// Grpc-Test-Support
112105
testImplementation("io.grpc:grpc-testing")
113106
// Spring-Test-Support (Optional)
114-
testImplementation("org.springframework.boot:spring-boot-starter-test") {
115-
// Exclude the test engine you don't need
116-
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
117-
}
107+
testImplementation("org.springframework.boot:spring-boot-starter-test")
118108
// Mocking Framework (Optional)
119109
testImplementation("org.mockito:mockito-all")
120110
````

docs/en/server/testing.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,6 @@ For Maven add the following dependencies:
101101
<groupId>org.springframework.boot</groupId>
102102
<artifactId>spring-boot-starter-test</artifactId>
103103
<scope>test</scope>
104-
<!-- Exclude the test engine you don't need -->
105-
<exclusions>
106-
<exclusion>
107-
<groupId>org.junit.vintage</groupId>
108-
<artifactId>junit-vintage-engine</artifactId>
109-
</exclusion>
110-
</exclusions>
111104
</dependency>
112105
````
113106

@@ -120,10 +113,7 @@ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
120113
// Grpc-Test-Support
121114
testImplementation("io.grpc:grpc-testing")
122115
// Spring-Test-Support (Optional)
123-
testImplementation("org.springframework.boot:spring-boot-starter-test") {
124-
// Exclude the test engine you don't need
125-
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
126-
}
116+
testImplementation("org.springframework.boot:spring-boot-starter-test")
127117
````
128118

129119
## Unit Tests

docs/zh-CN/client/testing.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@ public class MyComponent {
8585
<groupId>org.springframework.boot</groupId>
8686
<artifactId>spring-boot-starter-test</artifactId>
8787
<scope>test</scope>
88-
<!-- Exclude the test engine you don't need -->
89-
<exclusions>
90-
<exclusion>
91-
<groupId>org.junit.vintage</groupId>
92-
<artifactId>junit-vintage-engine</artifactId>
93-
</exclusion>
94-
</exclusions>
9588
</dependency>
9689
<!-- Mocking Framework (Optional) -->
9790
<dependency>
@@ -110,10 +103,7 @@ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
110103
// Grpc-Test-Support
111104
testImplementation("io.grpc:grpc-testing")
112105
// Spring-Test-Support (Optional)
113-
testImplementation("org.springframework.boot:spring-boot-starter-test") {
114-
// Exclude the test engine you don't need
115-
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
116-
}
106+
testImplementation("org.springframework.boot:spring-boot-starter-test")
117107
// Mocking Framework (Optional)
118108
testImplementation("org.mockito:mockito-all")
119109
````

docs/zh-CN/server/testing.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@ public class MyServiceImpl extends MyServiceGrpc.MyServiceImplBase {
100100
<groupId>org.springframework.boot</groupId>
101101
<artifactId>spring-boot-starter-test</artifactId>
102102
<scope>test</scope>
103-
<!-- Exclude the test engine you don't need -->
104-
<exclusions>
105-
<exclusion>
106-
<groupId>org.junit.vintage</groupId>
107-
<artifactId>junit-vintage-engine</artifactId>
108-
</exclusion>
109-
</exclusions>
110103
</dependency>
111104
````
112105

@@ -119,10 +112,7 @@ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
119112
// Grpc-Test-Support
120113
testImplementation("io.grpc:grpc-testing")
121114
// Spring-Test-Support (Optional)
122-
testImplementation("org.springframework.boot:spring-boot-starter-test") {
123-
// Exclude the test engine you don't need
124-
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
125-
}
115+
testImplementation("org.springframework.boot:spring-boot-starter-test")
126116
````
127117

128118
## 单元测试

examples/cloud-eureka-server/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ dependencies {
66
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-server'
77
implementation 'org.springframework.boot:spring-boot-starter-actuator'
88

9-
testImplementation('org.springframework.boot:spring-boot-starter-test'){
10-
exclude module: 'junit-vintage-engine'
11-
exclude module: 'junit'
12-
}
9+
testImplementation('org.springframework.boot:spring-boot-starter-test')
1310
}

grpc-client-spring-boot-autoconfigure/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,5 @@ dependencies {
3030
api 'io.grpc:grpc-stub'
3131

3232
testImplementation 'io.grpc:grpc-testing'
33-
testImplementation('org.springframework.boot:spring-boot-starter-test') {
34-
exclude module: 'junit-vintage-engine'
35-
exclude module: 'junit'
36-
}
37-
38-
testImplementation 'org.junit.jupiter:junit-jupiter-api'
39-
40-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
33+
testImplementation('org.springframework.boot:spring-boot-starter-test')
4134
}

grpc-server-spring-boot-autoconfigure/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,5 @@ dependencies {
3131
api 'io.grpc:grpc-api'
3232

3333
testImplementation 'io.grpc:grpc-testing'
34-
testImplementation 'org.junit.jupiter:junit-jupiter-api'
35-
testImplementation('org.springframework.boot:spring-boot-starter-test') {
36-
exclude module: 'junit-vintage-engine'
37-
exclude module: 'junit'
38-
}
39-
40-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
34+
testImplementation('org.springframework.boot:spring-boot-starter-test')
4135
}

tests/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ dependencies {
7171
implementation 'jakarta.annotation:jakarta.annotation-api'
7272
}
7373
testImplementation 'io.grpc:grpc-testing'
74-
testImplementation('org.springframework.boot:spring-boot-starter-test') {
75-
exclude module: 'junit-vintage-engine'
76-
exclude module: 'junit'
77-
}
74+
testImplementation('org.springframework.boot:spring-boot-starter-test')
7875

7976
testImplementation 'org.springframework.boot:spring-boot-starter-actuator'
8077
testImplementation 'org.springframework.security:spring-security-config'

0 commit comments

Comments
 (0)