Skip to content

Commit a6b2b2f

Browse files
committed
Move tests that use Tomcat out of spring-boot-all
1 parent 310de95 commit a6b2b2f

20 files changed

+28
-1
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ include "spring-boot-project:spring-boot-autoconfigure-all"
6262
include "spring-boot-project:spring-boot-actuator"
6363
include "spring-boot-project:spring-boot-actuator-autoconfigure"
6464
include "spring-boot-project:spring-boot-all"
65+
include "spring-boot-project:spring-boot-all-integration-tests"
6566
include "spring-boot-project:spring-boot-docker-compose"
6667
include "spring-boot-project:spring-boot-devtools"
6768
include "spring-boot-project:spring-boot-docs"
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
plugins {
2+
id "java"
3+
}
4+
5+
description = "Spring Boot Integration Tests"
6+
7+
dependencies {
8+
testImplementation(project(":spring-boot-project:spring-boot-all"))
9+
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
10+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
11+
testImplementation("io.projectreactor.netty:reactor-netty-http")
12+
testImplementation("org.apache.httpcomponents.client5:httpclient5")
13+
testImplementation("org.assertj:assertj-core")
14+
testImplementation("org.eclipse.jetty:jetty-client")
15+
testImplementation("org.junit.jupiter:junit-jupiter")
16+
testImplementation("org.springframework:spring-test")
17+
testImplementation("org.springframework:spring-webmvc")
18+
19+
testRuntimeOnly("ch.qos.logback:logback-classic")
20+
testRuntimeOnly("io.undertow:undertow-servlet")
21+
testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-servlets")
22+
testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-webapp")
23+
}
24+
25+
test {
26+
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
27+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ dependencies {
9494
exclude(group: "commons-logging", module: "commons-logging")
9595
}
9696

97-
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
9897
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
9998
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
10099
testImplementation("org.springframework:spring-core-test")

0 commit comments

Comments
 (0)