From 0f8ca805e1df9011e71f0f7364347e658ad75e83 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 11 Oct 2022 15:34:30 +0200
Subject: [PATCH] Move hints to dedicated top-level package (avoiding
 aot<->support cycle)

See gh-29026, gh-29069
---
 .../test/context/{aot => }/hint/StandardTestRuntimeHints.java | 2 +-
 .../test/context/{aot => }/hint/TestContextRuntimeHints.java  | 2 +-
 .../test/context/{aot => }/hint/package-info.java             | 2 +-
 spring-test/src/main/resources/META-INF/spring/aot.factories  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename spring-test/src/main/java/org/springframework/test/context/{aot => }/hint/StandardTestRuntimeHints.java (97%)
 rename spring-test/src/main/java/org/springframework/test/context/{aot => }/hint/TestContextRuntimeHints.java (98%)
 rename spring-test/src/main/java/org/springframework/test/context/{aot => }/hint/package-info.java (82%)

diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java b/spring-test/src/main/java/org/springframework/test/context/hint/StandardTestRuntimeHints.java
similarity index 97%
rename from spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java
rename to spring-test/src/main/java/org/springframework/test/context/hint/StandardTestRuntimeHints.java
index 7cf688f4eb..9435f42513 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java
+++ b/spring-test/src/main/java/org/springframework/test/context/hint/StandardTestRuntimeHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.aot.hint;
+package org.springframework.test.context.hint;
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.core.annotation.MergedAnnotations;
diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/hint/TestContextRuntimeHints.java b/spring-test/src/main/java/org/springframework/test/context/hint/TestContextRuntimeHints.java
similarity index 98%
rename from spring-test/src/main/java/org/springframework/test/context/aot/hint/TestContextRuntimeHints.java
rename to spring-test/src/main/java/org/springframework/test/context/hint/TestContextRuntimeHints.java
index da36ec8d67..01d320c7a8 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/hint/TestContextRuntimeHints.java
+++ b/spring-test/src/main/java/org/springframework/test/context/hint/TestContextRuntimeHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.aot.hint;
+package org.springframework.test.context.hint;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/hint/package-info.java b/spring-test/src/main/java/org/springframework/test/context/hint/package-info.java
similarity index 82%
rename from spring-test/src/main/java/org/springframework/test/context/aot/hint/package-info.java
rename to spring-test/src/main/java/org/springframework/test/context/hint/package-info.java
index c507a75172..1043d98cea 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/hint/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/hint/package-info.java
@@ -4,7 +4,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.context.aot.hint;
+package org.springframework.test.context.hint;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/resources/META-INF/spring/aot.factories b/spring-test/src/main/resources/META-INF/spring/aot.factories
index dcedd2c64e..26309402f0 100644
--- a/spring-test/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-test/src/main/resources/META-INF/spring/aot.factories
@@ -1,5 +1,5 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.test.context.aot.hint.TestContextRuntimeHints
+org.springframework.test.context.hint.TestContextRuntimeHints
 
 org.springframework.test.context.aot.TestRuntimeHintsRegistrar=\
-org.springframework.test.context.aot.hint.StandardTestRuntimeHints
\ No newline at end of file
+org.springframework.test.context.hint.StandardTestRuntimeHints
\ No newline at end of file