Skip to content

Commit 1c37051

Browse files
committed
Upgrade to Hibernate 6.6.
Closes #3574
1 parent b279ff0 commit 1c37051

File tree

3 files changed

+4
-70
lines changed

3 files changed

+4
-70
lines changed

Jenkinsfile

-43
Original file line numberDiff line numberDiff line change
@@ -80,49 +80,6 @@ pipeline {
8080
}
8181
}
8282
}
83-
stage("test: baseline (hibernate 6.5 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-65-snapshots " +
98-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
99-
"ci/test.sh"
100-
}
101-
}
102-
}
103-
}
104-
}
105-
stage("test: baseline (hibernate 6.6 preview)") {
106-
agent {
107-
label 'data'
108-
}
109-
options { timeout(time: 30, unit: 'MINUTES')}
110-
environment {
111-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
112-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
113-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
114-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
115-
}
116-
steps {
117-
script {
118-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
119-
sh "PROFILE=all-dbs,hibernate-66 " +
120-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
121-
"ci/test.sh"
122-
}
123-
}
124-
}
125-
}
12683
stage("test: baseline (hibernate 6.6 snapshots)") {
12784
agent {
12885
label 'data'

pom.xml

+3-26
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030
<antlr>4.13.0</antlr> <!-- align with Hibernate's parser -->
3131
<eclipselink>3.0.4</eclipselink>
3232
<eclipselink-next>4.0.2</eclipselink-next>
33-
<hibernate>6.5.0.Final</hibernate>
34-
<hibernate-62>6.2.28.Final</hibernate-62>
35-
<hibernate-65-snapshots>6.5.3-SNAPSHOT</hibernate-65-snapshots>
36-
<hibernate-66>6.6.0.CR1</hibernate-66>
37-
<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
33+
<hibernate>6.6.0.Final</hibernate>
34+
<hibernate-62>6.2.30.Final</hibernate-62>
35+
<hibernate-66-snapshots>6.6.1-SNAPSHOT</hibernate-66-snapshots>
3836
<hibernate-70>7.0.0.Beta1</hibernate-70>
3937
<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
4038
<hsqldb>2.7.1</hsqldb>
@@ -72,27 +70,6 @@
7270
<hibernate>${hibernate-62}</hibernate>
7371
</properties>
7472
</profile>
75-
<profile>
76-
<id>hibernate-65-snapshots</id>
77-
<properties>
78-
<hibernate>${hibernate-65-snapshots}</hibernate>
79-
</properties>
80-
<repositories>
81-
<repository>
82-
<id>sonatype-oss</id>
83-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
84-
<releases>
85-
<enabled>false</enabled>
86-
</releases>
87-
</repository>
88-
</repositories>
89-
</profile>
90-
<profile>
91-
<id>hibernate-66</id>
92-
<properties>
93-
<hibernate>${hibernate-66}</hibernate>
94-
</properties>
95-
</profile>
9673
<profile>
9774
<id>hibernate-66-snapshots</id>
9875
<properties>

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public interface TestModelRepository extends JpaRepository<TestModel, Long> {
132132
void countUuid(UUID this_uuid);
133133

134134
@Procedure("countByLocalDate")
135-
void countLocalDate(@Temporal Date localDate);
135+
void countLocalDate(@Temporal Date this_local_date);
136136
}
137137

138138
@EnableJpaRepositories(considerNestedRepositories = true,

0 commit comments

Comments
 (0)