Skip to content

Commit bd8e398

Browse files
committed
Upgrade Hibernate 6.6 builds to Final release.
Closes #3573
1 parent f62d382 commit bd8e398

File tree

3 files changed

+6
-65
lines changed

3 files changed

+6
-65
lines changed

Jenkinsfile

+2-45
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pipeline {
8080
}
8181
}
8282
}
83-
stage("test: baseline (hibernate 6.5 snapshots)") {
83+
stage("test: baseline (hibernate 6.6)") {
8484
agent {
8585
label 'data'
8686
}
@@ -94,50 +94,7 @@ pipeline {
9494
script {
9595
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
9696
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-
}
126-
stage("test: baseline (hibernate 6.6 snapshots)") {
127-
agent {
128-
label 'data'
129-
}
130-
options { timeout(time: 30, unit: 'MINUTES')}
131-
environment {
132-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
133-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
134-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
135-
}
136-
steps {
137-
script {
138-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
139-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
140-
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
97+
sh "PROFILE=all-dbs,hibernate-66 " +
14198
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
14299
"ci/test.sh"
143100
}

pom.xml

+3-19
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@
3131
<eclipselink>3.0.4</eclipselink>
3232
<eclipselink-next>4.0.2</eclipselink-next>
3333
<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>
34+
<hibernate-62>6.2.30.Final</hibernate-62>
35+
<hibernate-66>6.6.0.Final</hibernate-66>
36+
<hibernate-66-snapshots>6.6.1-SNAPSHOT</hibernate-66-snapshots>
3837
<hibernate-70>7.0.0.Beta1</hibernate-70>
3938
<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
4039
<hsqldb>2.7.1</hsqldb>
@@ -66,21 +65,6 @@
6665
<hibernate>${hibernate-62}</hibernate>
6766
</properties>
6867
</profile>
69-
<profile>
70-
<id>hibernate-65-snapshots</id>
71-
<properties>
72-
<hibernate>${hibernate-65-snapshots}</hibernate>
73-
</properties>
74-
<repositories>
75-
<repository>
76-
<id>sonatype-oss</id>
77-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
78-
<releases>
79-
<enabled>false</enabled>
80-
</releases>
81-
</repository>
82-
</repositories>
83-
</profile>
8468
<profile>
8569
<id>hibernate-66</id>
8670
<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)