Skip to content

Commit 43b40ed

Browse files
odrotbohmodrotbohm
committed
Broaden integration test builds against Hibernate 6 versions.
Upgrade to Hibernate 6.5 as baseline. Set up build profiles for all supported Hibernate 6 versions. Also trigger them in CI as compatibility builds. Ticket: GH-3413.
1 parent a3cf247 commit 43b40ed

File tree

2 files changed

+67
-30
lines changed

2 files changed

+67
-30
lines changed

‎Jenkinsfile

+44-23
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pipeline {
5757
}
5858

5959
parallel {
60-
stage("test: baseline (hibernate 6.4.x snapshots)") {
60+
stage("test: hibernate 6.2 (LTS)") {
6161
agent {
6262
label 'data'
6363
}
@@ -71,34 +71,55 @@ pipeline {
7171
steps {
7272
script {
7373
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
74-
sh "PROFILE=all-dbs,hibernate-64-next " +
74+
sh "PROFILE=all-dbs,hibernate-62 " +
75+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
76+
"ci/test.sh"
77+
}
78+
}
79+
}
80+
}
81+
stage("test: baseline (hibernate 6.5 snapshots)") {
82+
agent {
83+
label 'data'
84+
}
85+
options { timeout(time: 30, unit: 'MINUTES')}
86+
environment {
87+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
88+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
89+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
90+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
91+
}
92+
steps {
93+
script {
94+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
95+
sh "PROFILE=all-dbs,hibernate-65-snapshots " +
96+
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
97+
"ci/test.sh"
98+
}
99+
}
100+
}
101+
}
102+
stage("test: baseline (hibernate 6.6 snapshots)") {
103+
agent {
104+
label 'data'
105+
}
106+
options { timeout(time: 30, unit: 'MINUTES')}
107+
environment {
108+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
109+
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
110+
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
111+
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
112+
}
113+
steps {
114+
script {
115+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
116+
sh "PROFILE=all-dbs,hibernate-66-snapshots " +
75117
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
76118
"ci/test.sh"
77119
}
78120
}
79121
}
80122
}
81-
stage("test: hibernate 6.2 (LTS)") {
82-
agent {
83-
label 'data'
84-
}
85-
options { timeout(time: 30, unit: 'MINUTES')}
86-
environment {
87-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
88-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
89-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
90-
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
91-
}
92-
steps {
93-
script {
94-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
95-
sh "PROFILE=all-dbs,hibernate-62 " +
96-
"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
97-
"ci/test.sh"
98-
}
99-
}
100-
}
101-
}
102123
stage("test: java.next (next)") {
103124
agent {
104125
label 'data'

‎pom.xml

100644100755
+23-7
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
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.4.4.Final</hibernate>
34-
<hibernate-64-next-snapshots>6.4.5-SNAPSHOT</hibernate-64-next-snapshots>
35-
<hibernate-62>6.2.22.Final</hibernate-62>
33+
<hibernate>6.5.0.CR1</hibernate>
34+
<hibernate-62>6.2.24.Final</hibernate-62>
35+
<hibernate-65-snapshots>6.5.0-SNAPSHOT</hibernate-65-snapshots>
36+
<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
3637
<hsqldb>2.7.1</hsqldb>
3738
<h2>2.2.220</h2>
3839
<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
@@ -57,9 +58,15 @@
5758

5859
<profiles>
5960
<profile>
60-
<id>hibernate-64-next</id>
61+
<id>hibernate-62</id>
6162
<properties>
62-
<hibernate>${hibernate-64-next-snapshots}</hibernate>
63+
<hibernate>${hibernate-62}</hibernate>
64+
</properties>
65+
</profile>
66+
<profile>
67+
<id>hibernate-65-snapshots</id>
68+
<properties>
69+
<hibernate>${hibernate-65-snapshots}</hibernate>
6370
</properties>
6471
<repositories>
6572
<repository>
@@ -72,10 +79,19 @@
7279
</repositories>
7380
</profile>
7481
<profile>
75-
<id>hibernate-62</id>
82+
<id>hibernate-66-snapshots</id>
7683
<properties>
77-
<hibernate>${hibernate-62}</hibernate>
84+
<hibernate>${hibernate-66-snapshots}</hibernate>
7885
</properties>
86+
<repositories>
87+
<repository>
88+
<id>sonatype-oss</id>
89+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
90+
<releases>
91+
<enabled>false</enabled>
92+
</releases>
93+
</repository>
94+
</repositories>
7995
</profile>
8096
<profile>
8197
<id>all-dbs</id>

0 commit comments

Comments
 (0)