From e46c29df5225a223db59e0f9de666ba7ee499452 Mon Sep 17 00:00:00 2001
From: Christoph Strobl <christoph.strobl@broadcom.com>
Date: Tue, 12 Mar 2024 10:25:51 +0100
Subject: [PATCH] Move jakarta.persistence-api dependency.

For some reason the querydsl-apt plugin does not see the persistence-api dependency on the classpath, so we moved it directly to the annotation processing.

See: #3388
---
 pom.xml                                                    | 7 +------
 spring-data-jpa/pom.xml                                    | 5 +++++
 .../org/springframework/data/jpa/AntlrVersionTests.java    | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6fa3b9e1b..867f54a1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
 		<hibernate-62>6.2.22.Final</hibernate-62>
 		<hsqldb>2.7.1</hsqldb>
 		<h2>2.2.220</h2>
+		<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
 		<jsqlparser>4.5</jsqlparser>
 		<mysql-connector-java>8.0.33</mysql-connector-java>
 		<postgresql>42.6.0</postgresql>
@@ -74,12 +75,6 @@
 			<properties>
 				<hibernate>${hibernate-62}</hibernate>
 			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>jakarta.persistence</groupId>
-					<artifactId>jakarta.persistence-api</artifactId>
-				</dependency>
-			</dependencies>
 		</profile>
 		<profile>
 			<id>all-dbs</id>
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 3906c450c1..85c7444505 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -345,6 +345,11 @@
 							<artifactId>hibernate-jpamodelgen</artifactId>
 							<version>${hibernate}</version>
 						</path>
+						<path>
+							<groupId>jakarta.persistence</groupId>
+							<artifactId>jakarta.persistence-api</artifactId>
+							<version>${jakarta-persistence-api}</version>
+						</path>
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/AntlrVersionTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/AntlrVersionTests.java
index 4b55de9a7b..bc3c34dd34 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/AntlrVersionTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/AntlrVersionTests.java
@@ -23,11 +23,11 @@
 import org.antlr.v4.runtime.RuntimeMetaData;
 import org.hibernate.grammars.hql.HqlParser;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.MethodVisitor;
 import org.springframework.asm.Opcodes;
+import org.springframework.data.jpa.util.DisabledOnHibernate62;
 import org.springframework.lang.Nullable;
 
 /**
@@ -41,6 +41,7 @@
 class AntlrVersionTests {
 
 	@Test
+	@DisabledOnHibernate62
 	void antlrVersionConvergence() throws Exception {
 
 		ClassReader reader = new ClassReader(HqlParser.class.getName());