Skip to content

Add Hibernate ORM 7.3 testing #2112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beikov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Hibernate ORM 7.3 testing #2112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,13 @@ jobs:
jdk: 17
spring-data: spring-data-4.0.x
################################################
# hibernate-7.3
################################################
- rdbms: h2
provider: hibernate-7.3
jdk: 17
spring-data: spring-data-4.0.x
################################################
# LTS JDKs
################################################
- rdbms: h2
Expand Down
4 changes: 4 additions & 0 deletions ci/build-github-latest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ elif [ "$COMPONENT" == 'hibernate-7.2' ]; then
export JPAPROVIDER="hibernate-7.2"
export SPRING_DATA="spring-data-4.0.x"
export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-7.2=[7.2,7.2.Alpha)"
elif [ "$COMPONENT" == 'hibernate-7.3' ]; then
export JPAPROVIDER="hibernate-7.3"
export SPRING_DATA="spring-data-4.0.x"
export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-7.3=[7.3,7.3.Alpha)"
else
export JPAPROVIDER="hibernate-6.2"
export SPRING_DATA="spring-data-3.1.x"
Expand Down
61 changes: 61 additions & 0 deletions core/testsuite-hibernate6/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,5 +962,66 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>hibernate-7.3</id>
<properties>
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta-jaxb-api}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jakarta-jaxb}</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>${version.jakarta-jpa-3.2-api}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${version.jakarta-jta}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${version.jakarta-activation}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-7.2</artifactId>
<scope>test</scope>
</dependency>
<!-- IntelliJ apparently needs the annotation processor here -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-7.3}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
62 changes: 62 additions & 0 deletions core/testsuite-jakarta-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,68 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>hibernate-7.3</id>
<properties>
<jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate-7.3}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta-jaxb-api}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jakarta-jaxb}</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${version.jakarta-jta}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${version.jakarta-activation}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-7.2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-testsuite-base-hibernate7</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<!-- IntelliJ apparently needs the annotation processor here -->
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-7.3}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
169 changes: 169 additions & 0 deletions core/testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3089,6 +3089,175 @@
</plugins>
</build>
</profile>
<profile>
<id>hibernate-7.3</id>
<!-- Note that we compile the test suite against Hibernate 5.6 because this testsuite will be jakarta-transformed -->
<properties>
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66</jpa.excludedGroups>
<additional.source.directory>src/main/hibernate</additional.source.directory>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate-5.6}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.hibernate-5.6}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate-5.6}</version>
</dependency>
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-52</artifactId>
<version>${version.hibernate-types}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta-jaxb-api}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jakarta-jaxb}</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${version.jakarta-jta}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${version.jakarta-activation}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
<scope>compile</scope>
</dependency>
<!-- IntelliJ apparently needs the annotation processor here -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.6}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${additional.source.directory}</source>
<source>${project.build.directory}/generated-sources/metamodel</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source-hibernate</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/hibernate</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<executions>
<execution>
<id>process</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<additionalSourceDirectories>
<additionalSourceDirectory>${additional.source.directory}</additionalSourceDirectory>
</additionalSourceDirectories>
<!-- source output directory -->
<outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
<processors>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</processors>
</configuration>
</execution>
</executions>
<dependencies>
<!-- Metamodel -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.6}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta-jaxb-api}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jakarta-jaxb}</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${version.jakarta-jta}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${version.jakarta-activation}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>eclipselink</id>
<properties>
Expand Down
Loading
Loading