Skip to content

Commit 5e8d1d4

Browse files
committed
Update deployment tests to use Servlet 6.1 compatible containers
Closes gh-47026
1 parent 96d096e commit 5e8d1d4

File tree

5 files changed

+3
-130
lines changed

5 files changed

+3
-130
lines changed

system-test/spring-boot-deployment-system-tests/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ dependencies {
4545
systemTestImplementation(project(":starter:spring-boot-starter-test"))
4646
systemTestImplementation(project(":test-support:spring-boot-test-support"))
4747
systemTestImplementation("org.apache.httpcomponents.client5:httpclient5")
48+
systemTestImplementation("org.slf4j:slf4j-simple")
49+
systemTestImplementation("org.springframework:spring-web")
4850
systemTestImplementation("org.testcontainers:junit-jupiter")
4951
systemTestImplementation("org.testcontainers:testcontainers")
50-
systemTestImplementation("org.springframework:spring-web")
5152
}
5253

5354
systemTest {

system-test/spring-boot-deployment-system-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

system-test/spring-boot-deployment-system-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

system-test/spring-boot-deployment-system-tests/src/systemTest/java/org/springframework/boot/deployment/TomcatDeploymentTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class TomcatDeploymentTests extends AbstractDeploymentTests {
3030

3131
@Container
32-
static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:10.1.15-jdk17",
32+
static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:11.0.10-jdk17",
3333
"/usr/local/tomcat/webapps", DEFAULT_PORT);
3434

3535
@Override

system-test/spring-boot-deployment-system-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)