Skip to content

Commit bf91ec1

Browse files
committed
Merge pull request #35568 from dreis2211
* pr/35568: Remove unnecessary exclude from spring-restdocs-mockmvc Closes gh-35568
2 parents ca8ebbf + b2b5728 commit bf91ec1

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@ dependencies {
172172
testImplementation("org.springframework:spring-orm")
173173
testImplementation("org.springframework.data:spring-data-rest-webmvc")
174174
testImplementation("org.springframework.integration:spring-integration-jmx")
175-
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc") {
176-
exclude group: "javax.servlet", module: "javax.servlet-api"
177-
}
175+
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
178176
testImplementation("org.springframework.restdocs:spring-restdocs-webtestclient")
179177
testImplementation("org.springframework.security:spring-security-test")
180178
testImplementation("org.yaml:snakeyaml")

spring-boot-project/spring-boot-docs/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@ dependencies {
145145
implementation("org.springframework.graphql:spring-graphql-test")
146146
implementation("org.springframework.kafka:spring-kafka")
147147
implementation("org.springframework.kafka:spring-kafka-test")
148-
implementation("org.springframework.restdocs:spring-restdocs-mockmvc") {
149-
exclude group: "javax.servlet", module: "javax.servlet-api"
150-
}
148+
implementation("org.springframework.restdocs:spring-restdocs-mockmvc")
151149
implementation("org.springframework.restdocs:spring-restdocs-restassured")
152150
implementation("org.springframework.restdocs:spring-restdocs-webtestclient")
153151
implementation("org.springframework.security:spring-security-config")

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ dependencies {
4848
optional("org.springframework.data:spring-data-r2dbc")
4949
optional("org.springframework.data:spring-data-redis")
5050
optional("org.springframework.graphql:spring-graphql-test")
51-
optional("org.springframework.restdocs:spring-restdocs-mockmvc") {
52-
exclude group: "javax.servlet", module: "javax.servlet-api"
53-
}
51+
optional("org.springframework.restdocs:spring-restdocs-mockmvc")
5452
optional("org.springframework.restdocs:spring-restdocs-restassured")
5553
optional("org.springframework.restdocs:spring-restdocs-webtestclient")
5654
optional("org.springframework.security:spring-security-config")

0 commit comments

Comments
 (0)