Skip to content

Commit 3c10d46

Browse files
committed
HV-2071 Build with JDK 21
1 parent dc3535f commit 3c10d46

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
7575
*
7676
*/
7777

78-
@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 17 Latest'
78+
@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 21 Latest'
7979
@Field final String MAVEN_TOOL = 'Apache Maven 3.9'
8080

8181
// Default node pattern, to be used for resource-intensive stages.
@@ -101,14 +101,14 @@ stage('Configure') {
101101
// This should not include every JDK; in particular let's not care too much about EOL'd JDKs like version 9
102102
// See http://www.oracle.com/technetwork/java/javase/eol-135779.html
103103
new JdkBuildEnvironment(testJavaVersion: '17', testCompilerTool: 'OpenJDK 17 Latest',
104+
condition: TestCondition.AFTER_MERGE),
105+
new JdkBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
104106
condition: TestCondition.BEFORE_MERGE,
105107
isDefault: true),
108+
106109
// We want to enable preview features when testing newer builds of OpenJDK:
107110
// even if we don't use these features, just enabling them can cause side effects
108111
// and it's useful to test that.
109-
new JdkBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
110-
testLauncherArgs: '--enable-preview',
111-
condition: TestCondition.AFTER_MERGE),
112112
new JdkBuildEnvironment(testJavaVersion: '23', testCompilerTool: 'OpenJDK 23 Latest',
113113
testLauncherArgs: '--enable-preview',
114114
condition: TestCondition.AFTER_MERGE),
@@ -120,11 +120,11 @@ stage('Configure') {
120120
condition: TestCondition.AFTER_MERGE)
121121
],
122122
wildflyTck: [
123-
new WildFlyTckBuildEnvironment(testJavaVersion: '17', testCompilerTool: 'OpenJDK 17 Latest',
123+
new WildFlyTckBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
124124
condition: TestCondition.ON_DEMAND)
125125
],
126126
sigtest: [
127-
new SigTestBuildEnvironment(testJavaVersion: '17', jdkTool: 'OpenJDK 17 Latest',
127+
new SigTestBuildEnvironment(testJavaVersion: '21', jdkTool: 'OpenJDK 21 Latest',
128128
condition: TestCondition.BEFORE_MERGE)
129129
]
130130
])

jenkins/nightly/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Library('hibernate-jenkins-pipeline-helpers') _
77

88
def withMavenWorkspace(Closure body) {
9-
withMavenWorkspace('OpenJDK 17 Latest', body)
9+
withMavenWorkspace('OpenJDK 21 Latest', body)
1010
}
1111

1212
def withMavenWorkspace(jdk, Closure body) {

jenkins/release/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
}
1414
tools {
1515
maven 'Apache Maven 3.9'
16-
jdk 'OpenJDK 17 Latest'
16+
jdk 'OpenJDK 21 Latest'
1717
}
1818
options {
1919
buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')

jenkins/snapshot-publish/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline {
1818
}
1919
tools {
2020
maven 'Apache Maven 3.9'
21-
jdk 'OpenJDK 17 Latest'
21+
jdk 'OpenJDK 21 Latest'
2222
}
2323
options {
2424
// Wait for 1h before publishing snapshots, in case there's more commits.

0 commit comments

Comments
 (0)