From 169d170247bea88c773da0155fe526925a7af971 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Oct 2023 21:54:32 +1300
Subject: [PATCH] Explicit annotation processors required with JDK 22

JDK 22 changes such that annotation processors are not found by default on
the classpath. As such they either need to be explicitly registered with
the compiler (e.g. maven-compiler-plugin) or use -proc:full
---
 ebean-querybean/pom.xml   | 15 +++++++--------
 ebean-redis/pom.xml       | 21 +++++++++++++--------
 tests/test-java16/pom.xml |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 5d82e9d67..621957cd1 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -67,13 +67,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>querybean-generator</artifactId>
-      <version>13.23.0-jakarta</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
@@ -103,7 +96,13 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <compilerArgument>-proc:full</compilerArgument>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.ebean</groupId>
+              <artifactId>querybean-generator</artifactId>
+              <version>13.23.0-jakarta</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <!-- Enhancement -->
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index f69a4206f..302d9b62d 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -40,13 +40,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>querybean-generator</artifactId>
-      <version>13.23.0-jakarta</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
@@ -72,7 +65,19 @@
 
   <build>
     <plugins>
-
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.ebean</groupId>
+              <artifactId>querybean-generator</artifactId>
+              <version>13.23.0-jakarta</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 2b5dec814..b49550510 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -52,7 +52,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.22.0</version>
+              <version>13.22.0-jakarta</version>
             </path>
           </annotationProcessorPaths>
         </configuration>