Fixing Boot 4 breaking changes

Author: ryanjbaxter

docs/modules/ROOT/pages/property-source-config/configmap-propertysource.adoc

@@ -575,12 +575,12 @@ If you want your application to fail the start-up process in such cases, you can
 
 [#config-map-retry]
 You can also make your application retry loading `ConfigMap` property sources on a failure. First, you need to
-set `spring.cloud.kubernetes.config.fail-fast=true`. Then you need to add `spring-retry` 
-and `spring-boot-starter-aop` to your classpath. You can configure retry properties such as
+set `spring.cloud.kubernetes.config.fail-fast=true`. Then you need to add `spring-retry`
+and `spring-boot-starter-aspectj` to your classpath. You can configure retry properties such as
 the maximum number of attempts, backoff options like initial interval, multiplier, max interval by setting the
 `spring.cloud.kubernetes.config.retry.*` properties.
 
-NOTE: If you already have `spring-retry` and `spring-boot-starter-aop` on the classpath for some reason
+NOTE: If you already have `spring-retry` and `spring-boot-starter-aspectj` on the classpath for some reason
 and want to enable fail-fast, but do not want retry to be enabled; you can disable retry for `ConfigMap` `PropertySources`
 by setting `spring.cloud.kubernetes.config.retry.enabled=false`.
 

docs/modules/ROOT/pages/property-source-config/secrets-propertysource.adoc

@@ -11,12 +11,12 @@ When enabled, the `Fabric8SecretsPropertySource` looks up Kubernetes for `Secret
 . Named after the application (as defined by `spring.application.name`)
 . Matching some labels
 
-*Note:* 
+*Note:*
 
 By default, consuming Secrets through the API (points 2 and 3 above) *is not enabled* for security reasons. The permission 'list' on secrets allows clients to inspect secrets values in the specified namespace.
 Further, we recommend that containers share secrets through mounted volumes.
 
-If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an authorization policy, such as RBAC. 
+If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an authorization policy, such as RBAC.
 For more information about risks and best practices when consuming Secrets through the API refer to https://kubernetes.io/docs/concepts/configuration/secret/#best-practices[this doc].
 
 If the secrets are found, their data is made available to the application.
@@ -135,16 +135,16 @@ the `Secret` named `s1` would be looked up in the namespace that the application
 See xref:property-source-config/namespace-resolution.adoc[namespace-resolution] to get a better understanding of how the namespace
 of the application is resolved.
 
-xref:property-source-config/configmap-propertysource.adoc#config-map-fail-fast[Similar to the `ConfigMaps`]; if you want your application to fail to start 
+xref:property-source-config/configmap-propertysource.adoc#config-map-fail-fast[Similar to the `ConfigMaps`]; if you want your application to fail to start
 when it is unable to load `Secrets` property sources, you can set `spring.cloud.kubernetes.secrets.fail-fast=true`.
 
 It is also possible to enable retry for `Secret` property sources xref:property-source-config/configmap-propertysource.adoc#config-map-retry[like the `ConfigMaps`].
-As with the `ConfigMap` property sources, first you need to set `spring.cloud.kubernetes.secrets.fail-fast=true`. 
-Then you need to add `spring-retry` and `spring-boot-starter-aop` to your classpath. 
+As with the `ConfigMap` property sources, first you need to set `spring.cloud.kubernetes.secrets.fail-fast=true`.
+Then you need to add `spring-retry` and `spring-boot-starter-aspectj` to your classpath.
 Retry behavior of the `Secret` property sources can be configured by setting the `spring.cloud.kubernetes.secrets.retry.*`
 properties.
 
-NOTE: If you already have `spring-retry` and `spring-boot-starter-aop` on the classpath for some reason
+NOTE: If you already have `spring-retry` and `spring-boot-starter-aspectj` on the classpath for some reason
 and want to enable fail-fast, but do not want retry to be enabled; you can disable retry for `Secrets` `PropertySources`
 by setting `spring.cloud.kubernetes.secrets.retry.enabled=false`.
 

spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.boot.EnvironmentPostProcessor=\
 org.springframework.cloud.kubernetes.client.profile.KubernetesClientProfileEnvironmentPostProcessor

spring-cloud-kubernetes-client-config/pom.xml

@@ -59,12 +59,6 @@
 			<artifactId>spring-retry</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-health</artifactId>
@@ -107,7 +101,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-aspectj</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolver.java

@@ -19,8 +19,8 @@
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 
-import org.springframework.boot.BootstrapRegistry;
-import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.boot.bootstrap.BootstrapRegistry;
+import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
 import org.springframework.boot.context.config.ConfigDataLocation;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.config.Profiles;

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolverTests.java

@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
-import org.springframework.boot.DefaultBootstrapContext;
+import org.springframework.boot.bootstrap.DefaultBootstrapContext;
 import org.springframework.boot.context.config.ConfigDataLocation;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.config.Profiles;

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientConfigServerBootstrapper.java

@@ -31,7 +31,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.boot.BootstrapRegistry;
+import org.springframework.boot.bootstrap.BootstrapRegistry;
 import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver;
 import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver.PropertyResolver;
 import org.springframework.cloud.config.client.ConfigServerInstanceProvider;

spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,6 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.client.discovery.KubernetesDiscoveryClientConfigClientBootstrapConfiguration
 
-org.springframework.boot.BootstrapRegistryInitializer=\
+org.springframework.boot.bootstrap.BootstrapRegistryInitializer=\
 org.springframework.cloud.kubernetes.client.discovery.KubernetesClientConfigServerBootstrapper
 

spring-cloud-kubernetes-commons/pom.xml

@@ -66,7 +66,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-aspectj</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java

@@ -34,8 +34,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.boot.BootstrapRegistry;
-import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.boot.bootstrap.BootstrapRegistry;
+import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.env.Environment;
 import org.springframework.core.style.ToStringCreator;