fixup! Move Servlet high-level infrastructure to spring-boot-servlet

Author: snicoll

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

@@ -11,13 +11,11 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
 	testImplementation(project(":spring-boot-project:spring-boot-jackson"))
 	testImplementation(project(":spring-boot-project:spring-boot-jersey"))
-	testImplementation(project(":spring-boot-project:spring-boot-jetty"))
 	testImplementation(project(":spring-boot-project:spring-boot-metrics"))
 	testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	testImplementation(project(":spring-boot-project:spring-boot-undertow"))
 	testImplementation(project(":spring-boot-project:spring-boot-web-server"))
 	testImplementation(project(":spring-boot-project:spring-boot-webflux"))
 	testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
@@ -29,9 +27,4 @@ dependencies {
 	testImplementation("net.minidev:json-smart")
 	testImplementation("org.springframework.security:spring-security-web")
 	testRuntimeOnly("ch.qos.logback:logback-classic")
-	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
-}
-
-test {
-	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
 }

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

@@ -18,12 +18,20 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-data-redis"))
 	testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
+	testImplementation(project(":spring-boot-project:spring-boot-jetty"))
 	testImplementation(project(":spring-boot-project:spring-boot-security"))
 	testImplementation(project(":spring-boot-project:spring-boot-servlet"))
 	testImplementation(project(":spring-boot-project:spring-boot-session-data-redis"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-undertow"))
 	testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
+
+	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }
+
+test {
+	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
+}

spring-boot-project/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/web/servlet/MultipartAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.web.servlet;
+package org.springframework.boot.autoconfigure.web.servlet;
 
 import java.net.URI;
 import java.util.stream.Stream;