From 8cf65aacce94bb73ca186cd8c74816a8be57d421 Mon Sep 17 00:00:00 2001
From: Oryan <oryan.mat@eblock.ca>
Date: Fri, 23 Oct 2026 22:55:41 -0400
Subject: [PATCH 1/4] Make spring.aop an optional module dependency

spring-aop is a provided dependency, but module-info required it, so an
application on the module path without Spring failed at startup with
'Module spring.aop not found'.
---
 src/main/kotlin/module-info.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
index e0590cc3..7f9b572f 100644
--- a/src/main/kotlin/module-info.java
+++ b/src/main/kotlin/module-info.java
@@ -16,7 +16,8 @@
     requires org.apache.commons.lang3;
     requires org.reactivestreams;
     requires org.slf4j;
-    requires spring.aop;
+    // only for applications that have Spring AOP proxies
+    requires static spring.aop;
 
     exports graphql.kickstart.tools;
 

From 65f46f62c9b0ea2b1730eabe3472e865b3d6bed9 Mon Sep 17 00:00:00 2001
From: Oryan <oryan.mat@eblock.ca>
Date: Fri, 23 Oct 2026 22:55:51 -0400
Subject: [PATCH 2/4] Build the Spring AOP proxy support against Spring 7

The Renovate rule kept Spring below 6 because it needed Java 17, which
is now the minimum.
---
 pom.xml       | 2 +-
 renovate.json | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index aac7fb7f..9d00128f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>5.3.39</version>
+                <version>7.0.10</version>
                 <scope>provided</scope>
             </dependency>
 
diff --git a/renovate.json b/renovate.json
index ed68ddc2..731a5f3a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -18,13 +18,6 @@
         "org.jetbrains.kotlin:{/,}**"
       ]
     },
-    {
-      "description": "Spring 6 requires Java 17",
-      "allowedVersions": "<6.0.0",
-      "matchPackageNames": [
-        "/org.springframework/"
-      ]
-    },
     {
       "description": "Release/snapshot builds use the minimum supported JDK",
       "matchDepNames": [

From 310bc0c8a33d5ed2f721c57a0ee89b26c3cf4f36 Mon Sep 17 00:00:00 2001
From: Oryan <oryan.mat@eblock.ca>
Date: Fri, 23 Oct 2026 22:55:51 -0400
Subject: [PATCH 3/4] Say that Java 17 is required and use implementation in
 the Gradle snippet

Gradle 7 removed the compile configuration.
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7063522a..03f7126a 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ Are you interested in improving our documentation, working on the codebase, revi
 
 ## Quick start
 
+GraphQL Java Tools requires Java 17 or later.
+
 ### Using Gradle
 Set the Kotlin version in your `gradle.properties`:
 ```
@@ -26,7 +28,7 @@ kotlin.version=2.3.10
 
 Add the dependency:
 ```groovy
-compile 'io.github.graphql-java-kickstart:graphql-java-tools:14.5.0'
+implementation 'io.github.graphql-java-kickstart:graphql-java-tools:14.5.0'
 ```
 
 ### Using Maven

From 70a1410ca3251e95e9f7a3636a49b9f3a3ee5651 Mon Sep 17 00:00:00 2001
From: Oryan <oryan.mat@eblock.ca>
Date: Fri, 23 Oct 2026 22:55:51 -0400
Subject: [PATCH 4/4] Remove unused test dependencies and redundant compiler
 properties

Nothing uses cglib-nodep or objenesis. The release option already sets
the source and target, so it now reads java.version too. The
surefire-junit4 provider stays, with a comment on why.
---
 pom.xml | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d00128f..6908f522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,6 @@
         <graphql-java.version>26.1</graphql-java.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
 
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
         <useReleaseProfile>false</useReleaseProfile>
         <project.scm.id>github</project.scm.id>
     </properties>
@@ -86,11 +84,6 @@
             </dependency>
 
             <!-- Test -->
-            <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-nodep</artifactId>
-                <version>3.3.0</version>
-            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
@@ -106,11 +99,6 @@
                 <artifactId>junit</artifactId>
                 <version>4.13.2</version>
             </dependency>
-            <dependency>
-                <groupId>org.objenesis</groupId>
-                <artifactId>objenesis</artifactId>
-                <version>3.6</version>
-            </dependency>
             <dependency>
                 <groupId>org.reactivestreams</groupId>
                 <artifactId>reactive-streams-tck</artifactId>
@@ -202,16 +190,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams-tck</artifactId>
@@ -247,7 +225,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.16.0</version>
                 <configuration>
-                    <release>17</release>
+                    <release>${java.version}</release>
                     <failOnWarning>true</failOnWarning>
                 </configuration>
             </plugin>
@@ -257,6 +235,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.6.0</version>
                 <dependencies>
+                    <!-- reactive-streams-tck brings TestNG, which makes surefire pick a provider that runs none of the JUnit 4 tests -->
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit4</artifactId>