Skip to content

Commit 9f6e634

Browse files
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
1 parent 128f7da commit 9f6e634

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<hibernate-62>6.2.22.Final</hibernate-62>
3636
<hsqldb>2.7.1</hsqldb>
3737
<h2>2.2.220</h2>
38+
<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
3839
<jsqlparser>4.8</jsqlparser>
3940
<mysql-connector-java>8.0.33</mysql-connector-java>
4041
<postgresql>42.6.0</postgresql>
@@ -75,12 +76,6 @@
7576
<properties>
7677
<hibernate>${hibernate-62}</hibernate>
7778
</properties>
78-
<dependencies>
79-
<dependency>
80-
<groupId>jakarta.persistence</groupId>
81-
<artifactId>jakarta.persistence-api</artifactId>
82-
</dependency>
83-
</dependencies>
8479
</profile>
8580
<profile>
8681
<id>all-dbs</id>

spring-data-jpa/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,11 @@
345345
<artifactId>hibernate-jpamodelgen</artifactId>
346346
<version>${hibernate}</version>
347347
</path>
348+
<path>
349+
<groupId>jakarta.persistence</groupId>
350+
<artifactId>jakarta.persistence-api</artifactId>
351+
<version>${jakarta-persistence-api}</version>
352+
</path>
348353
</annotationProcessorPaths>
349354
</configuration>
350355
</plugin>

spring-data-jpa/src/test/java/org/springframework/data/jpa/AntlrVersionTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import org.antlr.v4.runtime.RuntimeMetaData;
2424
import org.hibernate.grammars.hql.HqlParser;
2525
import org.junit.jupiter.api.Test;
26-
2726
import org.springframework.asm.ClassReader;
2827
import org.springframework.asm.ClassVisitor;
2928
import org.springframework.asm.MethodVisitor;
3029
import org.springframework.asm.Opcodes;
30+
import org.springframework.data.jpa.util.DisabledOnHibernate62;
3131
import org.springframework.lang.Nullable;
3232

3333
/**
@@ -41,6 +41,7 @@
4141
class AntlrVersionTests {
4242

4343
@Test
44+
@DisabledOnHibernate62
4445
void antlrVersionConvergence() throws Exception {
4546

4647
ClassReader reader = new ClassReader(HqlParser.class.getName());

0 commit comments

Comments
 (0)