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
This commit is contained in:
Christoph Strobl
2024-03-12 10:25:51 +01:00
parent 73076f967e
commit e46c29df52
3 changed files with 8 additions and 7 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
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 @@ import org.springframework.lang.Nullable;
class AntlrVersionTests {
@Test
@DisabledOnHibernate62
void antlrVersionConvergence() throws Exception {
ClassReader reader = new ClassReader(HqlParser.class.getName());