Relocate bean override infrastructure to the proper package in the TCF

spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java

@@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AnnotationConfigurationException;
-import org.springframework.test.bean.override.BeanOverrideTestExecutionListener;
-import org.springframework.test.bean.override.mockito.MockitoResetTestExecutionListener;
-import org.springframework.test.bean.override.mockito.MockitoTestExecutionListener;
+import org.springframework.test.context.bean.override.BeanOverrideTestExecutionListener;
+import org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener;
+import org.springframework.test.context.bean.override.mockito.MockitoTestExecutionListener;
 import org.springframework.test.context.event.ApplicationEventsTestExecutionListener;
 import org.springframework.test.context.event.EventPublishingTestExecutionListener;
 import org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener;

spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.util.Map;
 import java.util.function.Predicate;
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.SimpleThreadScope;
 import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
-import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation;
-import org.springframework.test.bean.override.example.ExampleService;
-import org.springframework.test.bean.override.example.FailingExampleService;
-import org.springframework.test.bean.override.example.RealExampleService;
+import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation;
+import org.springframework.test.context.bean.override.example.ExampleService;
+import org.springframework.test.context.bean.override.example.FailingExampleService;
+import org.springframework.test.context.bean.override.example.RealExampleService;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.Assert;
 

spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideParserTests.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.reflect.Field;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation;
-import org.springframework.test.bean.override.example.TestBeanOverrideMetaAnnotation;
+import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation;
+import org.springframework.test.context.bean.override.example.TestBeanOverrideMetaAnnotation;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
-import static org.springframework.test.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER;
+import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER;
 
 /**
  * Unit tests for {@link BeanOverrideParser}.

spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.convention;
+package org.springframework.test.context.bean.override.convention;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.test.bean.override.example.ExampleService;
-import org.springframework.test.bean.override.example.FailingExampleService;
+import org.springframework.test.context.bean.override.example.ExampleService;
+import org.springframework.test.context.bean.override.example.FailingExampleService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatException;

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideAnnotation.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.test.bean.override.BeanOverride;
+import org.springframework.test.context.bean.override.BeanOverride;
 
 @BeanOverride(ExampleBeanOverrideProcessor.class)
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideProcessor.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.test.bean.override.BeanOverrideProcessor;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideProcessor;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 
 public class ExampleBeanOverrideProcessor implements BeanOverrideProcessor {
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 /**
  * Example service interface for mocking tests.

spring-test/src/test/java/org/springframework/test/context/bean/override/example/FailingExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import org.springframework.stereotype.Service;
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/RealExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 /**
  * Example service implementation for spy tests.

spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestBeanOverrideMetaAnnotation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestOverrideMetadata.java

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
+
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
@@ -25,11 +26,11 @@ import java.lang.reflect.Modifier;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE;
+import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE;
 
 public class TestOverrideMetadata extends OverrideMetadata {
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/package-info.java

@@ -3,7 +3,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;