diff --git a/conformance-tests/client-spring-http-client/pom.xml b/conformance-tests/client-spring-http-client/pom.xml
index cbf0d1970..33e653207 100644
--- a/conformance-tests/client-spring-http-client/pom.xml
+++ b/conformance-tests/client-spring-http-client/pom.xml
@@ -21,7 +21,7 @@
 	</scm>
 
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<spring-boot.version>4.1.0</spring-boot.version>
 		<spring-ai.version>2.0.0</spring-ai.version>
 		<spring-ai-mcp-security.version>0.1.13</spring-ai-mcp-security.version>
diff --git a/pom.xml b/pom.xml
index f60f3918b..a1bd54e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,9 +54,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<surefireArgLine />
 
 		<assert4j.version>3.27.6</assert4j.version>