Skip to content

Commit f441402

Browse files
committed
Require JDK 23 for building (but keep the Java 17 baseline)
1 parent d8cea6c commit f441402

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

.github/workflows/ci-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2626
with:
2727
distribution: 'temurin'
28-
java-version: '21'
28+
java-version: '23'
2929

3030
- name: Generate cache key
3131
id: cache-key

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
build:
3434
permissions:
3535
contents: read
36-
name: OpenJDK 21 - ${{matrix.rdbms}}
36+
name: OpenJDK 23 - ${{matrix.rdbms}}
3737
runs-on: ubuntu-latest
3838
strategy:
3939
fail-fast: false
@@ -63,11 +63,11 @@ jobs:
6363
env:
6464
RDBMS: ${{ matrix.rdbms }}
6565
run: ci/database-start.sh
66-
- name: Set up Java 21
66+
- name: Set up Java 23
6767
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6868
with:
6969
distribution: 'temurin'
70-
java-version: '21'
70+
java-version: '23'
7171

7272
- name: Generate cache key
7373
id: cache-key
@@ -270,11 +270,11 @@ jobs:
270270
persist-credentials: false
271271
- name: Reclaim disk space and sanitize user home
272272
run: .github/ci-prerequisites-atlas.sh
273-
- name: Set up Java 21
273+
- name: Set up Java 23
274274
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
275275
with:
276276
distribution: 'temurin'
277-
java-version: '21'
277+
java-version: '23'
278278

279279
- name: Generate cache key
280280
id: cache-key

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4141
with:
4242
distribution: 'temurin'
43-
java-version: '21'
43+
java-version: '23'
4444

4545
- name: Checkout repository
4646
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
1414
@Library('hibernate-jenkins-pipeline-helpers') _
1515
import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
1616

17-
@Field final String DEFAULT_JDK_VERSION = '21'
17+
@Field final String DEFAULT_JDK_VERSION = '23'
1818
@Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
1919
@Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
2020
@Field List<BuildEnvironment> environments
@@ -42,7 +42,8 @@ stage('Configure') {
4242
new BuildEnvironment( node: 's390x' ),
4343
// We generally build with JDK 21, but our baseline is Java 17, so we test with JDK 17, to be sure everything works.
4444
// Here we even compile the main code with JDK 17, to be sure no JDK 18+ classes are depended on.
45-
new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
45+
new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
46+
new BuildEnvironment( mainJdkVersion: '21', testJdkVersion: '21' ),
4647
// We want to enable preview features when testing newer builds of OpenJDK:
4748
// even if we don't use these features, just enabling them can cause side effects
4849
// and it's useful to test that.

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ See link:MAINTAINERS.md#ci[MAINTAINERS.md] for information about CI.
1818

1919
== Building from sources
2020

21-
The build requires at least JDK 21, and produces Java 17 bytecode.
21+
The build requires at least JDK 23, and produces Java 17 bytecode.
2222

2323
Hibernate uses https://gradle.org[Gradle] as its build tool. See the _Gradle Primer_ section below if you are new to
2424
Gradle.

ci/jpa-3.2-tck.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else {
2222
pipeline {
2323
agent none
2424
tools {
25-
jdk 'OpenJDK 21 Latest'
25+
jdk 'OpenJDK 23 Latest'
2626
}
2727
options {
2828
rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])

ci/release/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pipeline {
7070
cron('0 0 * * 0')
7171
}
7272
tools {
73-
jdk 'OpenJDK 21 Latest'
73+
jdk 'OpenJDK 23 Latest'
7474
}
7575
options {
7676
buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')

ci/snapshot-publish.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pipeline {
2323
label 'Release'
2424
}
2525
tools {
26-
jdk 'OpenJDK 21 Latest'
26+
jdk 'OpenJDK 23 Latest'
2727
}
2828
options {
2929
rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])

nightly.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
1414
@Library('hibernate-jenkins-pipeline-helpers') _
1515
import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
1616

17-
@Field final String DEFAULT_JDK_VERSION = '21'
17+
@Field final String DEFAULT_JDK_VERSION = '23'
1818
@Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
1919
@Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
2020
@Field List<BuildEnvironment> environments

0 commit comments

Comments
 (0)