Skip to content

Commit 354d542

Browse files
committed
Upgrade to Hibernate 7.0 Beta1.
Closes: #3671 Original Pull Request: #3695
1 parent 86cb088 commit 354d542

File tree

3 files changed

+4
-89
lines changed

3 files changed

+4
-89
lines changed

Jenkinsfile

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -58,50 +58,6 @@ pipeline {
5858
}
5959

6060
parallel {
61-
stage("test: hibernate 6.2 (LTS)") {
62-
agent {
63-
label 'data'
64-
}
65-
options { timeout(time: 30, unit: 'MINUTES')}
66-
environment {
67-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
68-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
69-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
70-
}
71-
steps {
72-
script {
73-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
74-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
75-
sh "PROFILE=all-dbs,hibernate-62 " +
76-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
77-
"ci/test.sh"
78-
}
79-
}
80-
}
81-
}
82-
}
83-
stage("test: baseline (hibernate 6.6 snapshots)") {
84-
agent {
85-
label 'data'
86-
}
87-
options { timeout(time: 30, unit: 'MINUTES')}
88-
environment {
89-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
90-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
91-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
92-
}
93-
steps {
94-
script {
95-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
96-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
97-
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
98-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
99-
"ci/test.sh"
100-
}
101-
}
102-
}
103-
}
104-
}
10561
stage("test: java.next (next)") {
10662
agent {
10763
label 'data'

pom.xml

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@
2828

2929
<properties>
3030
<antlr>4.13.0</antlr> <!-- align with Hibernate's parser -->
31-
<eclipselink>4.0.6</eclipselink>
32-
<eclipselink-next>4.0.7-SNAPSHOT</eclipselink-next>
33-
<hibernate>6.6.15.Final</hibernate>
34-
<hibernate-62>6.2.36.Final</hibernate-62>
35-
<hibernate-66-snapshots>6.6.16-SNAPSHOT</hibernate-66-snapshots>
36-
<hibernate-70>7.0.0.Beta5</hibernate-70>
31+
<eclipselink>4.0.4</eclipselink>
32+
<eclipselink-next>4.0.5-SNAPSHOT</eclipselink-next>
33+
<hibernate>7.0.0.Beta1</hibernate>
3734
<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
3835
<hsqldb>2.7.4</hsqldb>
3936
<h2>2.3.232</h2>
@@ -57,44 +54,6 @@
5754

5855

5956
<profiles>
60-
<profile>
61-
<id>hibernate-62</id>
62-
<properties>
63-
<hibernate>${hibernate-62}</hibernate>
64-
</properties>
65-
</profile>
66-
<profile>
67-
<id>hibernate-66-snapshots</id>
68-
<properties>
69-
<hibernate>${hibernate-66-snapshots}</hibernate>
70-
</properties>
71-
<repositories>
72-
<repository>
73-
<id>sonatype-oss</id>
74-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
75-
<releases>
76-
<enabled>false</enabled>
77-
</releases>
78-
</repository>
79-
</repositories>
80-
</profile>
81-
<profile>
82-
<id>hibernate-70</id>
83-
<properties>
84-
<hibernate>${hibernate-70}</hibernate>
85-
<jakarta-persistence-api>3.2.0</jakarta-persistence-api>
86-
<antlr>4.13.2</antlr>
87-
</properties>
88-
<repositories>
89-
<repository>
90-
<id>sonatype-oss</id>
91-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
92-
<releases>
93-
<enabled>false</enabled>
94-
</releases>
95-
</repository>
96-
</repositories>
97-
</profile>
9857
<profile>
9958
<id>hibernate-70-snapshots</id>
10059
<properties>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import jakarta.persistence.criteria.From;
3333
import jakarta.persistence.criteria.Join;
3434
import jakarta.persistence.criteria.JoinType;
35+
import jakarta.persistence.criteria.Nulls;
3536
import jakarta.persistence.criteria.Path;
3637
import jakarta.persistence.criteria.Root;
3738
import jakarta.persistence.spi.PersistenceProvider;
@@ -127,7 +128,6 @@ void prefersFetchOverJoin() {
127128

128129
assertThat(expr.getParentPath()).hasFieldOrPropertyWithValue("fetched", true);
129130
assertThat(from.getFetches()).hasSize(1);
130-
assertThat(from.getJoins()).hasSize(1);
131131
}
132132

133133
@Test // DATAJPA-401, DATAJPA-1238

0 commit comments

Comments
 (0)