Move tests that use Tomcat out of spring-boot-test

Issue: 46073

settings.gradle

@@ -66,6 +66,7 @@ include "spring-boot-project:spring-boot-docs"
 include "spring-boot-project:spring-boot-parent"
 include "spring-boot-project:spring-boot-test"
 include "spring-boot-project:spring-boot-test-autoconfigure"
+include "spring-boot-project:spring-boot-test-integration-tests"
 include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-tomcat"
 include "spring-boot-project:spring-boot-tools:spring-boot-antlib"

spring-boot-project/spring-boot-test-integration-tests/build.gradle

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+plugins {
+	id "java"
+}
+
+description = "Spring Boot Test Integration Tests"
+
+dependencies {
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
+	testImplementation("org.springframework:spring-webflux")
+	testImplementation("org.springframework:spring-webmvc")
+	testImplementation("org.springframework.graphql:spring-graphql-test")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
+}

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

@@ -53,12 +53,10 @@ dependencies {
 	optional("org.springframework:spring-webflux")
 	optional("org.springframework.graphql:spring-graphql-test")
 
-	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation("ch.qos.logback:logback-classic")
 	testImplementation("io.mockk:mockk")
 	testImplementation("jakarta.json:jakarta.json-api")
-	testImplementation("ch.qos.logback:logback-classic")
-	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
 	testImplementation("org.apache.groovy:groovy")
 	testImplementation("org.apache.groovy:groovy-xml")
 	testImplementation("org.eclipse:yasson")

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

@@ -35,6 +35,7 @@ dependencies {
 		exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
 	}
 
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional("org.apache.tomcat.embed:tomcat-embed-jasper")
 	optional("org.springframework:spring-webflux")