Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Hibernate 7.0 Beta1.

Browse Source 
Closes: #3671
Original Pull Request: #3695
This commit is contained in:
Mark Paluch
2024-11-25 09:10:53 +01:00
parent 6624f4b26a
commit e983e1832a
3 changed files with 4 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Jenkinsfile vendored
View File

@@ -58,50 +58,6 @@ pipeline {
}
parallel {
stage("test: hibernate 6.2 (LTS)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-62 " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
}
stage("test: baseline (hibernate 6.6 snapshots)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES')}
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
}
steps {
script {
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
"ci/test.sh"
}
}
}
}
}
stage("test: java.next (next)") {
agent {
label 'data'

47
pom.xml
View File

@@ -28,12 +28,9 @@
<properties>
<antlr>4.13.0</antlr> <!-- align with Hibernate's parser -->
<eclipselink>4.0.6</eclipselink>
<eclipselink-next>4.0.7-SNAPSHOT</eclipselink-next>
<hibernate>6.6.15.Final</hibernate>
<hibernate-62>6.2.36.Final</hibernate-62>
<hibernate-66-snapshots>6.6.16-SNAPSHOT</hibernate-66-snapshots>
<hibernate-70>7.0.0.Beta5</hibernate-70>
<eclipselink>4.0.4</eclipselink>
<eclipselink-next>4.0.5-SNAPSHOT</eclipselink-next>
<hibernate>7.0.0.Beta1</hibernate>
<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
<hsqldb>2.7.4</hsqldb>
<h2>2.3.232</h2>
@@ -57,44 +54,6 @@
<profiles>
<profile>
<id>hibernate-62</id>
<properties>
<hibernate>${hibernate-62}</hibernate>
</properties>
</profile>
<profile>
<id>hibernate-66-snapshots</id>
<properties>
<hibernate>${hibernate-66-snapshots}</hibernate>
</properties>
<repositories>
<repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
<profile>
<id>hibernate-70</id>
<properties>
<hibernate>${hibernate-70}</hibernate>
<jakarta-persistence-api>3.2.0</jakarta-persistence-api>
<antlr>4.13.2</antlr>
</properties>
<repositories>
<repository>
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
<profile>
<id>hibernate-70-snapshots</id>
<properties>

2
spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java
View File

@@ -32,6 +32,7 @@ import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.From;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.Nulls;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.spi.PersistenceProvider;
@@ -127,7 +128,6 @@ class QueryUtilsIntegrationTests {
assertThat(expr.getParentPath()).hasFieldOrPropertyWithValue("fetched", true);
assertThat(from.getFetches()).hasSize(1);
assertThat(from.getJoins()).hasSize(1);
}
@Test // DATAJPA-401, DATAJPA-1238