From 8579f0014fcb41797d0f542d9ffb97d0b42c6040 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Fri, 28 Mar 2025 10:59:53 +0000
Subject: [PATCH] Break the link between spring-boot-test and spring-boot-all

---
 spring-boot-project/spring-boot-all/build.gradle               | 1 -
 .../src/main/resources/META-INF/spring/aot.factories           | 2 --
 spring-boot-project/spring-boot-test/build.gradle              | 2 +-
 spring-boot-project/spring-boot/build.gradle                   | 3 +++
 .../http/client/AbstractClientHttpRequestFactoryBuilder.java   | 0
 .../boot/http/client/ClientHttpRequestFactoryBuilder.java      | 0
 .../boot/http/client/ClientHttpRequestFactoryRuntimeHints.java | 2 +-
 .../boot/http/client/ClientHttpRequestFactorySettings.java     | 0
 .../main/java/org/springframework/boot/http/client/Empty.java  | 0
 .../springframework/boot/http/client/HttpClientSettings.java   | 0
 .../client/HttpComponentsClientHttpRequestFactoryBuilder.java  | 0
 .../boot/http/client/HttpComponentsHttpAsyncClientBuilder.java | 0
 .../boot/http/client/HttpComponentsHttpClientBuilder.java      | 0
 .../boot/http/client/HttpComponentsRedirectStrategy.java       | 0
 .../boot/http/client/HttpComponentsSslBundleTlsStrategy.java   | 0
 .../org/springframework/boot/http/client/HttpRedirects.java    | 0
 .../boot/http/client/JdkClientHttpRequestFactoryBuilder.java   | 0
 .../springframework/boot/http/client/JdkHttpClientBuilder.java | 0
 .../boot/http/client/JettyClientHttpRequestFactoryBuilder.java | 0
 .../boot/http/client/JettyHttpClientBuilder.java               | 0
 .../http/client/ReactorClientHttpRequestFactoryBuilder.java    | 0
 .../boot/http/client/ReactorHttpClientBuilder.java             | 0
 .../ReflectiveComponentsClientHttpRequestFactoryBuilder.java   | 0
 .../http/client/SimpleClientHttpRequestFactoryBuilder.java     | 0
 .../org/springframework/boot/http/client/package-info.java     | 2 +-
 .../client/reactive/AbstractClientHttpConnectorBuilder.java    | 0
 .../boot/http/client/reactive/ClientHttpConnectorBuilder.java  | 0
 .../boot/http/client/reactive/ClientHttpConnectorSettings.java | 0
 .../reactive/HttpComponentsClientHttpConnectorBuilder.java     | 0
 .../http/client/reactive/JdkClientHttpConnectorBuilder.java    | 0
 .../http/client/reactive/JettyClientHttpConnectorBuilder.java  | 0
 .../client/reactive/ReactorClientHttpConnectorBuilder.java     | 0
 .../boot/http/client/reactive/package-info.java                | 0
 .../springframework/boot/web/client/BasicAuthentication.java   | 0
 .../boot/web/client/ClientHttpRequestFactories.java            | 0
 .../boot/web/client/ClientHttpRequestFactorySettings.java      | 2 +-
 .../springframework/boot/web/client/RestClientCustomizer.java  | 2 +-
 .../springframework/boot/web/client/RestTemplateBuilder.java   | 0
 .../RestTemplateBuilderClientHttpRequestInitializer.java       | 2 +-
 .../boot/web/client/RestTemplateCustomizer.java                | 2 +-
 .../boot/web/client/RestTemplateRequestCustomizer.java         | 2 +-
 .../springframework/boot/web/client/RootUriBuilderFactory.java | 0
 .../boot/web/client/RootUriTemplateHandler.java                | 0
 .../java/org/springframework/boot/web/client/package-info.java | 2 +-
 .../org/springframework/boot/web/codec/CodecCustomizer.java    | 2 +-
 .../java/org/springframework/boot/web/codec/package-info.java  | 2 +-
 .../src/main/resources/META-INF/spring/aot.factories           | 1 +
 .../boot/http/client/ClientHttpRequestFactoryBuilderTests.java | 2 +-
 .../http/client/ClientHttpRequestFactoryRuntimeHintsTests.java | 0
 .../http/client/ClientHttpRequestFactorySettingsTests.java     | 0
 .../boot/web/client/ClientHttpRequestFactoriesTests.java       | 2 +-
 .../boot/web/client/ClientHttpRequestFactorySettingsTests.java | 2 +-
 .../RestTemplateBuilderClientHttpRequestInitializerTests.java  | 2 +-
 .../boot/web/client/RestTemplateBuilderTests.java              | 0
 .../boot/web/client/RootUriBuilderFactoryTests.java            | 2 +-
 .../boot/web/client/RootUriTemplateHandlerTests.java           | 0
 56 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java (98%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/Empty.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/HttpRedirects.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/package-info.java (92%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/http/client/reactive/package-info.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java (98%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java (95%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java (97%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java (95%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java (96%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/client/package-info.java (92%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java (95%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/main/java/org/springframework/boot/web/codec/package-info.java (92%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java (99%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java (99%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java (97%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java (98%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java (100%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java (96%)
 rename spring-boot-project/{spring-boot-all => spring-boot}/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java (100%)

diff --git a/spring-boot-project/spring-boot-all/build.gradle b/spring-boot-project/spring-boot-all/build.gradle
index 99528d4b8c..cb35422678 100644
--- a/spring-boot-project/spring-boot-all/build.gradle
+++ b/spring-boot-project/spring-boot-all/build.gradle
@@ -42,7 +42,6 @@ dependencies {
 	optional("org.apache.groovy:groovy")
 	optional("org.apache.groovy:groovy-xml")
 	optional("org.crac:crac")
-	optional("org.eclipse.jetty:jetty-client")
 	optional("org.hamcrest:hamcrest-library")
 	optional("org.hibernate.orm:hibernate-core")
 	optional("org.hibernate.validator:hibernate-validator")
diff --git a/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 980d82c814..0000000000
--- a/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints
diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle
index 10341750ac..acc46f434a 100644
--- a/spring-boot-project/spring-boot-test/build.gradle
+++ b/spring-boot-project/spring-boot-test/build.gradle
@@ -9,7 +9,7 @@ plugins {
 description = "Spring Boot Test"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot"))
 	api("org.springframework:spring-test")
 
 	optional("com.fasterxml.jackson.core:jackson-databind")
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
index 9b178d5b1b..e6b7c81d1f 100644
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -21,11 +21,14 @@ dependencies {
 	optional("com.google.code.gson:gson")
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("jakarta.validation:jakarta.validation-api")
+	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("org.apache.groovy:groovy")
+	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.apache.logging.log4j:log4j-api")
 	optional("org.apache.logging.log4j:log4j-core")
 	optional("org.apache.logging.log4j:log4j-jul")
 	optional("org.crac:crac")
+	optional("org.eclipse.jetty:jetty-client")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.slf4j:jul-to-slf4j")
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
similarity index 98%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
index a1451a0eef..be8a645b11 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/Empty.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/Empty.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/Empty.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/Empty.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpRedirects.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/package-info.java
similarity index 92%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/package-info.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/package-info.java
index 95d81ef006..98c354d1e3 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
similarity index 98%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
index 8da5ae64b0..36f5adfcae 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
similarity index 95%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
index e19b9f5a02..a608d57441 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
similarity index 97%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
index 3d61be72a3..51b85ac187 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
similarity index 95%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
index 67622c2005..30d6264b90 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
similarity index 96%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
index 5f1a1604f9..8d0d3f5a02 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/package-info.java
similarity index 92%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/package-info.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/package-info.java
index 54315432b3..92f8dc56e0 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
similarity index 95%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
index a95a5a46b7..7bd9c0d9f3 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/package-info.java
similarity index 92%
rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/package-info.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/package-info.java
index 5b24f2cd56..b1f0a1f53d 100644
--- a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
index 5213e85094..9685b80543 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
@@ -5,6 +5,7 @@ org.springframework.boot.WebApplicationType$WebApplicationTypeRuntimeHints,\
 org.springframework.boot.context.config.ConfigDataLocationRuntimeHints,\
 org.springframework.boot.context.config.ConfigDataPropertiesRuntimeHints,\
 org.springframework.boot.env.PropertySourceRuntimeHints,\
+org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
 org.springframework.boot.json.JacksonRuntimeHints,\
 org.springframework.boot.logging.java.JavaLoggingSystemRuntimeHints,\
 org.springframework.boot.logging.logback.LogbackRuntimeHints,\
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
similarity index 99%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
index c777ff59a0..d9437f88f4 100644
--- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
similarity index 99%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
index b7cda155db..6a4dc39550 100644
--- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
similarity index 97%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
index 312858c1db..cd64c80f37 100644
--- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
similarity index 98%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
index 5e7ff9a91b..4a206f734a 100644
--- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
similarity index 96%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
index a3dd338a2d..4c2cc0e742 100644
--- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
diff --git a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java