From 1fedf011c3cb449a0039ecafecc3563fa9d50b94 Mon Sep 17 00:00:00 2001
From: Auri Munoz <amunozhe@redhat.com>
Date: Thu, 30 May 2024 21:19:09 +0200
Subject: [PATCH] using new spring aop module

---
 bom/application/pom.xml                                    | 7 ++++++-
 extensions/spring-data-jpa/runtime/pom.xml                 | 4 ++++
 .../src/main/resources/application.properties              | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index b619e2275d9edc..ba3290c658f86b 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -181,7 +181,7 @@
         <hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
         <flapdoodle.mongo.version>4.13.1</flapdoodle.mongo.version>
         <quarkus-spring-api.version>6.1.SP1-SNAPSHOT</quarkus-spring-api.version>
-        <quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
+        <quarkus-spring-data-api.version>2.1.SP2-SNAPSHOT</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>5.4.Final</quarkus-spring-security-api.version>
         <quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
         <mockito.version>5.12.0</mockito.version>
@@ -5876,6 +5876,11 @@
                 <artifactId>quarkus-spring-beans-api</artifactId>
                 <version>${quarkus-spring-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-aop-api</artifactId>
+                <version>${quarkus-spring-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-spring-data-jpa-api</artifactId>
diff --git a/extensions/spring-data-jpa/runtime/pom.xml b/extensions/spring-data-jpa/runtime/pom.xml
index 58a40263b61b27..48ed4cbf784dff 100644
--- a/extensions/spring-data-jpa/runtime/pom.xml
+++ b/extensions/spring-data-jpa/runtime/pom.xml
@@ -38,6 +38,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-core-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-aop-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-boot-orm-api</artifactId>
diff --git a/integration-tests/spring-data-jpa/src/main/resources/application.properties b/integration-tests/spring-data-jpa/src/main/resources/application.properties
index a4cde9e7582bb3..2abadc97530a69 100644
--- a/integration-tests/spring-data-jpa/src/main/resources/application.properties
+++ b/integration-tests/spring-data-jpa/src/main/resources/application.properties
@@ -7,7 +7,7 @@ quarkus.hibernate-orm.database.generation=drop-and-create
 # DataGenerator uses java.util.Random => needs to be runtime initialized
 # as j.u.Random is prohibited in the native image heap. Otherwise
 # random data becomes deterministic
-quarkus.native.additional-build-args=--initialize-at-run-time=io.quarkus.it.spring.data.jpa.DataGenerator
+quarkus.native.additional-build-args=--initialize-at-run-time=io.quarkus.it.spring.data.jpa.DataGenerator\\,org.springframework.data.domain.Sort$TypedSort,--initialize-at-build-time=org.springframework.aop,-H:TraceClassInitialization=true,-H:AbortOnTypeReachable=org.springframework.data.util.MethodInvocationRecorder
 #quarkus.hibernate-orm.log.sql=true
 
 %prod.quarkus.hibernate-orm.sql-load-script=import.sql