-
-
Notifications
You must be signed in to change notification settings - Fork 9.2k
Enable Java 25 support #11148
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.
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
Enable Java 25 support #11148
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a1c21cf
Bump winstone to get Jetty 12.1.1
alecharp c02f85b
Accept to start Jenkins with Java 25
alecharp 4ffa3fb
Build with Java 25
alecharp efbbd07
Merge branch 'master' into chore/java-25-support
gounthar 723c62a
Remove inaccurate javadoc that includes an incorrect link
MarkEWaite faa3fc8
Temporary fix for javadoc build
alecharp 894fd75
Bump winstone to 8.14
alecharp 03edd33
Merge branch 'master' into chore/java-25-support
alecharp 555861c
Merge branch 'master' into chore/java-25-support
alecharp 5a1690b
Merge branch 'master' into chore/java-25-support
timja 6f43077
Update Jenkinsfile
timja 7cf0c9f
Merge branch 'master' into chore/java-25-support
timja File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ properties([ | |
|
|
||
| def axes = [ | ||
| platforms: ['linux', 'windows'], | ||
| jdks: [17, 21], | ||
| jdks: [17, 21, 25], | ||
| ] | ||
|
|
||
| stage('Record build') { | ||
|
|
@@ -34,7 +34,7 @@ stage('Record build') { | |
| sh "launchable verify && launchable record build --name ${launchableName} --source jenkinsci/jenkins=." | ||
| axes.values().combinations { | ||
| def (platform, jdk) = it | ||
| if (platform == 'windows' && jdk != 17) { | ||
| if (platform == 'windows' && jdk != axes.jdks.last()) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. reduces the manual effort to maintain this and decide which one to put |
||
| return // unnecessary use of hardware | ||
| } | ||
| def sessionFile = "launchable-session-${platform}-jdk${jdk}.txt" | ||
|
|
@@ -60,7 +60,7 @@ def builds = [:] | |
|
|
||
| axes.values().combinations { | ||
| def (platform, jdk) = it | ||
| if (platform == 'windows' && jdk != 17) { | ||
| if (platform == 'windows' && jdk != axes.jdks.last()) { | ||
| return // unnecessary use of hardware | ||
| } | ||
| builds["${platform}-jdk${jdk}"] = { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.