Create beginnings of spring-boot-tomcat module
This commit is contained in:
committed by
Phillip Webb
parent
0337830615
commit
349f296d26
@@ -16,8 +16,11 @@ configurations.all {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("jakarta.servlet:jakarta.servlet-api")
|
||||
|
||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) {
|
||||
exclude group: "org.hibernate.validator"
|
||||
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
|
||||
}
|
||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
|
||||
|
||||
@@ -28,8 +31,6 @@ dependencies {
|
||||
systemTestImplementation("org.testcontainers:junit-jupiter")
|
||||
systemTestImplementation("org.testcontainers:testcontainers")
|
||||
systemTestImplementation("org.springframework:spring-web")
|
||||
|
||||
providedRuntime(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat"))
|
||||
}
|
||||
|
||||
systemTest {
|
||||
|
||||
@@ -104,6 +104,7 @@ abstract class AbstractDeploymentTests {
|
||||
try {
|
||||
Awaitility.await().atMost(Duration.ofMinutes(10)).until(() -> {
|
||||
try {
|
||||
System.out.println(this.container.getLogs());
|
||||
consumer.accept(rest);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -386,6 +386,7 @@ class PaketoBuilderTests {
|
||||
return buildImage(imageName, arguments);
|
||||
}
|
||||
catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
if (Duration.ofNanos(System.nanoTime() - start).toMinutes() > 6) {
|
||||
throw ex;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation("org.springframework.boot:spring-boot-starter-web:{bootVersion}")
|
||||
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:{bootVersion}")
|
||||
}
|
||||
|
||||
war {
|
||||
|
||||
Reference in New Issue
Block a user