Skip to content

HV-2071 Build with JDK 21 #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 18, 2024
Merged

HV-2071 Build with JDK 21 #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bc28ca
HV-2071 Build with JDK 21
marko-bekhta Dec 17, 2024
33c8078
HV-2071 Set JDK 21 as a minimum required for the build
marko-bekhta Dec 17, 2024
d6d57fe
HV-2071 Use JDK 21 in GH action builds
marko-bekhta Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ jobs:
matrix:
os:
- {
name: "Linux JDK 17",
name: "Linux JDK 21",
runs-on: 'ubuntu-latest',
java: {
version: 17
version: 21
},
maven: {
args: ''
}
}
- {
name: "Windows JDK 17",
name: "Windows JDK 21",
runs-on: 'windows-latest',
java: {
version: 17
version: 21
},
maven: {
args: ''
Expand Down
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
*
*/

@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 17 Latest'
@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 21 Latest'
@Field final String MAVEN_TOOL = 'Apache Maven 3.9'

// Default node pattern, to be used for resource-intensive stages.
Expand All @@ -101,14 +101,14 @@ stage('Configure') {
// This should not include every JDK; in particular let's not care too much about EOL'd JDKs like version 9
// See http://www.oracle.com/technetwork/java/javase/eol-135779.html
new JdkBuildEnvironment(testJavaVersion: '17', testCompilerTool: 'OpenJDK 17 Latest',
condition: TestCondition.AFTER_MERGE),
new JdkBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
condition: TestCondition.BEFORE_MERGE,
isDefault: true),

// We want to enable preview features when testing newer builds of OpenJDK:
// even if we don't use these features, just enabling them can cause side effects
// and it's useful to test that.
new JdkBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
testLauncherArgs: '--enable-preview',
condition: TestCondition.AFTER_MERGE),
new JdkBuildEnvironment(testJavaVersion: '23', testCompilerTool: 'OpenJDK 23 Latest',
testLauncherArgs: '--enable-preview',
condition: TestCondition.AFTER_MERGE),
Expand All @@ -120,11 +120,11 @@ stage('Configure') {
condition: TestCondition.AFTER_MERGE)
],
wildflyTck: [
new WildFlyTckBuildEnvironment(testJavaVersion: '17', testCompilerTool: 'OpenJDK 17 Latest',
new WildFlyTckBuildEnvironment(testJavaVersion: '21', testCompilerTool: 'OpenJDK 21 Latest',
condition: TestCondition.ON_DEMAND)
],
sigtest: [
new SigTestBuildEnvironment(testJavaVersion: '17', jdkTool: 'OpenJDK 17 Latest',
new SigTestBuildEnvironment(testJavaVersion: '21', jdkTool: 'OpenJDK 21 Latest',
condition: TestCondition.BEFORE_MERGE)
]
])
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ the Apache Software License 2.0. Refer to license.txt for more information.
## Build from Source

You can build Hibernate Validator from source by cloning the git repository `git://github.com/hibernate/hibernate-validator.git`.
You will also need a JDK 17+ and Maven 3 (>= 3.9.8). With these prerequisites in place you can compile the source via:
You will also need a JDK 21+ and Maven 3 (>= 3.9.9). With these prerequisites in place you can compile the source via:

mvn clean install

Expand Down
2 changes: 1 addition & 1 deletion jenkins/nightly/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@Library('hibernate-jenkins-pipeline-helpers') _

def withMavenWorkspace(Closure body) {
withMavenWorkspace('OpenJDK 17 Latest', body)
withMavenWorkspace('OpenJDK 21 Latest', body)
}

def withMavenWorkspace(jdk, Closure body) {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/release/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
}
tools {
maven 'Apache Maven 3.9'
jdk 'OpenJDK 17 Latest'
jdk 'OpenJDK 21 Latest'
}
options {
buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')
Expand Down
2 changes: 1 addition & 1 deletion jenkins/snapshot-publish/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pipeline {
}
tools {
maven 'Apache Maven 3.9'
jdk 'OpenJDK 17 Latest'
jdk 'OpenJDK 21 Latest'
}
options {
// Wait for 1h before publishing snapshots, in case there's more commits.
Expand Down
5 changes: 1 addition & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@

<!-- JDK version required for the build -->
<!-- Remember to update README when changing the version here. -->
<jdk.min.version>17</jdk.min.version>
<jdk.min.version>21</jdk.min.version>
<!-- Maven version required for the build -->
<!--
When changing the version here, remember to:
Expand Down Expand Up @@ -1692,9 +1692,6 @@
<configuration>
<rules>
<requireReleaseDeps />
<requireJavaVersion>
<version>[17,18)</version>
</requireJavaVersion>
</rules>
<fail>true</fail>
</configuration>
Expand Down
Loading