Skip to content

Commit

Permalink
Move jakarta.persistence-api dependency.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
christophstrobl committed Mar 12, 2024
1 parent 73076f9 commit e46c29d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 1 addition & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions spring-data-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -41,6 +41,7 @@
class AntlrVersionTests {

@Test
@DisabledOnHibernate62
void antlrVersionConvergence() throws Exception {

ClassReader reader = new ClassReader(HqlParser.class.getName());
Expand Down

0 comments on commit e46c29d

Please sign in to comment.