Compatibility updates for framework 6 and boot 3

spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java

@@ -20,10 +20,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.servlet.ServletException;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;

spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java

@@ -16,12 +16,11 @@
 
 package org.springframework.cloud.context.properties;
 
-import javax.annotation.PostConstruct;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -143,7 +142,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests {
 	}
 
 	@ConfigurationProperties
-	protected static class TestProperties {
+	protected static class TestProperties implements InitializingBean {
 
 		private String message;
 
@@ -171,8 +170,8 @@ public class ConfigurationPropertiesRebinderIntegrationTests {
 			this.delay = delay;
 		}
 
-		@PostConstruct
-		public void init() {
+		@Override
+		public void afterPropertiesSet() {
 			this.count++;
 		}
 

spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java

@@ -19,11 +19,10 @@ package org.springframework.cloud.context.properties;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -120,7 +119,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests {
 	}
 
 	@ConfigurationProperties
-	protected static class TestProperties {
+	protected static class TestProperties implements InitializingBean {
 
 		private List<String> messages;
 
@@ -138,8 +137,8 @@ public class ConfigurationPropertiesRebinderListIntegrationTests {
 			return this.count;
 		}
 
-		@PostConstruct
-		public void init() {
+		@Override
+		public void afterPropertiesSet() {
 			this.count++;
 		}
 

spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java

@@ -16,10 +16,9 @@
 
 package org.springframework.cloud.context.properties;
 
-import javax.annotation.PostConstruct;
-
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -98,7 +97,7 @@ public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests {
 	}
 
 	@ConfigurationProperties
-	protected static class TestProperties {
+	protected static class TestProperties implements InitializingBean {
 
 		private String message;
 
@@ -126,8 +125,8 @@ public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests {
 			this.delay = delay;
 		}
 
-		@PostConstruct
-		public void init() {
+		@Override
+		public void afterPropertiesSet() {
 			this.count++;
 		}
 

spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java

@@ -23,7 +23,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.LiveBeansView;
 
 import static org.assertj.core.api.BDDAssertions.then;
 
@@ -66,10 +65,13 @@ public class RestartIntegrationTests {
 		then(this.context.getParent()).isNotNull();
 		then(this.context.getParent().getParent()).isNull();
 
-		LiveBeansView beans = new LiveBeansView();
-		String json = beans.getSnapshotAsJson();
-		then(json).containsOnlyOnce("parent\": \"bootstrap");
-		then(json).containsOnlyOnce("parent\": null");
+		// FIXME: 4.0.0 missing LiveBeansView
+		/*
+		 * LiveBeansView beans = new LiveBeansView(); String json =
+		 * beans.getSnapshotAsJson();
+		 * then(json).containsOnlyOnce("parent\": \"bootstrap");
+		 * then(json).containsOnlyOnce("parent\": null");
+		 */
 	}
 
 	@Configuration(proxyBeanMethods = false)