@@ -75,7 +75,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
75
75
*
76
76
*/
77
77
78
- @Field final String DEFAULT_JDK_TOOL = ' OpenJDK 17 Latest'
78
+ @Field final String DEFAULT_JDK_TOOL = ' OpenJDK 21 Latest'
79
79
@Field final String MAVEN_TOOL = ' Apache Maven 3.9'
80
80
81
81
// Default node pattern, to be used for resource-intensive stages.
@@ -101,14 +101,14 @@ stage('Configure') {
101
101
// This should not include every JDK; in particular let's not care too much about EOL'd JDKs like version 9
102
102
// See http://www.oracle.com/technetwork/java/javase/eol-135779.html
103
103
new JdkBuildEnvironment (testJavaVersion : ' 17' , testCompilerTool : ' OpenJDK 17 Latest' ,
104
+ condition : TestCondition . AFTER_MERGE ),
105
+ new JdkBuildEnvironment (testJavaVersion : ' 21' , testCompilerTool : ' OpenJDK 21 Latest' ,
104
106
condition : TestCondition . BEFORE_MERGE ,
105
107
isDefault : true ),
108
+
106
109
// We want to enable preview features when testing newer builds of OpenJDK:
107
110
// even if we don't use these features, just enabling them can cause side effects
108
111
// 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 ),
112
112
new JdkBuildEnvironment (testJavaVersion : ' 23' , testCompilerTool : ' OpenJDK 23 Latest' ,
113
113
testLauncherArgs : ' --enable-preview' ,
114
114
condition : TestCondition . AFTER_MERGE ),
@@ -120,11 +120,11 @@ stage('Configure') {
120
120
condition : TestCondition . AFTER_MERGE )
121
121
],
122
122
wildflyTck : [
123
- new WildFlyTckBuildEnvironment (testJavaVersion : ' 17 ' , testCompilerTool : ' OpenJDK 17 Latest' ,
123
+ new WildFlyTckBuildEnvironment (testJavaVersion : ' 21 ' , testCompilerTool : ' OpenJDK 21 Latest' ,
124
124
condition : TestCondition . ON_DEMAND )
125
125
],
126
126
sigtest : [
127
- new SigTestBuildEnvironment (testJavaVersion : ' 17 ' , jdkTool : ' OpenJDK 17 Latest' ,
127
+ new SigTestBuildEnvironment (testJavaVersion : ' 21 ' , jdkTool : ' OpenJDK 21 Latest' ,
128
128
condition : TestCondition . BEFORE_MERGE )
129
129
]
130
130
])
0 commit comments