diff --git a/spring-shell-samples/spring-shell-samples.gradle b/spring-shell-samples/spring-shell-samples.gradle
index 6b7939e5..3e0c73f7 100644
--- a/spring-shell-samples/spring-shell-samples.gradle
+++ b/spring-shell-samples/spring-shell-samples.gradle
@@ -16,6 +16,12 @@ springBoot {
 	buildInfo()
 }
 
+graalvmNative {
+	metadataRepository {
+		version = "0.1.1"
+	}
+}
+
 // TODO: workaround until boot's aot plugin automatically extends
 //       from all super configurations like graalvm's plugin does.
 configurations {
diff --git a/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java b/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java
index 901a09a4..4ed687a8 100644
--- a/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java
+++ b/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java
@@ -25,7 +25,6 @@ import org.springframework.aot.hint.ResourceHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
-import org.springframework.util.ClassUtils;
 
 public class SamplesRuntimeHints implements RuntimeHintsRegistrar {
 
@@ -58,20 +57,6 @@ public class SamplesRuntimeHints implements RuntimeHintsRegistrar {
 				"org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
 				"org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
 				"org.jline.terminal.impl.jna.win.Kernel32$UnionChar");
-		// from spring-native sb-3.0.x branch
-		registerHibernateValidatorHints(hints, classLoader);
-	}
-
-	private void registerHibernateValidatorHints(RuntimeHints hints, ClassLoader classLoader) {
-		if (!ClassUtils.isPresent("org.hibernate.validator.HibernateValidator", classLoader)) {
-			return;
-		}
-		hints.reflection().registerType(TypeReference.of("org.hibernate.validator.internal.util.logging.Log_$logger"),
-			hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
-		hints.reflection().registerType(
-			TypeReference.of("org.hibernate.validator.internal.util.logging.Messages_$bundle"),
-				hint -> hint.withField("INSTANCE", fieldHint -> {
-			}));
 	}
 
 	private void registerResources(ResourceHints resource) {