From 9975113879d785d360a7e26b7c44bdedaea39b85 Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Mon, 13 Oct 2025 11:02:20 +0200
Subject: [PATCH] Enable new build options for GraalVM 25 native image builds

Closes gh-35616
---
 .../org/springframework/context/aot/ContextAotProcessor.java  | 2 ++
 .../springframework/context/aot/ContextAotProcessorTests.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/aot/ContextAotProcessor.java b/spring-context/src/main/java/org/springframework/context/aot/ContextAotProcessor.java
index de0fe66eb34..59ae9835189 100644
--- a/spring-context/src/main/java/org/springframework/context/aot/ContextAotProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/aot/ContextAotProcessor.java
@@ -139,6 +139,8 @@ public abstract class ContextAotProcessor extends AbstractAotProcessor<ClassName
 		args.add("--report-unsupported-elements-at-runtime");
 		args.add("--no-fallback");
 		args.add("--install-exit-handlers");
+		args.add("--future-defaults=all");
+		args.add("--exact-reachability-metadata");
 		return args;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java b/spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java
index a32aac4af40..302927113e8 100644
--- a/spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java
@@ -113,7 +113,9 @@ class ContextAotProcessorTests {
 					Args = -H:Class=org.springframework.context.aot.ContextAotProcessorTests$SampleApplication \\
 					--report-unsupported-elements-at-runtime \\
 					--no-fallback \\
-					--install-exit-handlers
+					--install-exit-handlers \\
+					--future-defaults=all \\
+					--exact-reachability-metadata
 					""");
 		};
 	}