Require Jenkins 2.479 or newer #1172
Merged
Conversation
This file contains 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
MarkEWaite
force-pushed
the
test-jgit-7.0.0
branch
from
3b8f18e
to
b97ab86
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0-with-jakarta-ee-9
branch
from
1705b84
to
bb06bc8
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0
branch
2 times, most recently
from
6072abd
to
6bfa95c
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0-with-jakarta-ee-9
branch
from
bb06bc8
to
f3ff1ee
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0-with-jakarta-ee-9
branch
from
f3ff1ee
to
10fb949
Compare
JGit 7.0.0 requires Java 17. Jenkins 2.463 requires Java 17. Use the plugin bill of materials from 2.462.x because it is the closest we have to 2.463. The plugin is expected to work with any release 2.463 or later.
MarkEWaite
force-pushed
the
test-jgit-7.0.0
branch
from
6bfa95c
to
c14430c
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0-with-jakarta-ee-9
branch
from
10fb949
to
7f33b16
Compare
6 tasks
…aite/git-client-plugin into test-jgit-7.0.0-with-jakarta-ee-9
JGit 7.0.0 requires Java 17. Jenkins 2.463 requires Java 17. Use the plugin bill of materials from 2.462.x because it is the closest we have to 2.463. The plugin is expected to work with any release 2.463 or later. Adapt to removed API's in JGit 7.0.0 by replacing calls to removed API's with the recommended equivalents. Tested in my development environment and no issues detected. Tests run from a container based Jenkins controller with Windows, Linux, and FreeBSD agents. Tests ran on multiple weekly releases of Jenkins since 2.463. The Linux agents include: * Alpine * Debian Linux 11, 12, testing, and unstable * openSUSE * Red Hat Enterprise Linux 8 * Rocky Linux 9 * Ubuntu 20.04, 22.04, and 24.04
Removes a few of the workarounds since it is released.
MarkEWaite
removed
skip-changelog
MarkEWaite
changed the title
https://github.com/jenkinsci/plugin-pom/releases/tag/plugin-5.1 notes that it includes a workaround the outdated ASM API inclusion that Guice brings into Jenkins core. Has not affected the git client plugin, but it is good to remain current with the most recent release of the parent pom.
Cheeck if security scan is ready for Java 17 and Jakarta EE 9 This reverts commit 4bcca7e.
|
Should also migrate to EE 9: src/main/java/hudson/plugins/git/GitTool.java
30:import org.kohsuke.stapler.StaplerRequest;
156: public boolean configure(StaplerRequest req, JSONObject json) { |
No need to rely on the compatibility layer for EE 8
basil
approved these changes
Oct 9, 2024
MarkEWaite
added a commit
to MarkEWaite/bom
that referenced
this pull request
Oct 9, 2024
* jenkinsci/git-client-plugin#1172 * jenkinsci/git-plugin#1671 * jenkinsci/scm-api-plugin#282 Changes method signatures of several methods in the git plugin from x(StaplerRequest) to x(StaplerRequest2), but hoped that there are no consumers of those API's outside the git plugin.
6 tasks
jglick
reviewed
Oct 10, 2024
Comment on lines
63
to
64
| <!-- TODO Replace with the standard jenkins.baseline references after LTS requires Java 17 --> | ||
| <!-- <jenkins.version>${jenkins.baseline}.1</jenkins.version> --> |
There was a problem hiding this comment.
BOM will release Friday, then I plan to release the git client plugin 6.1.0 using that new plugin BOM release.
There was a problem hiding this comment.
Or maybe it is better to release git client plugin 6.1.0 before the weekly BOM so that it is available sooner to BOM consumers
There was a problem hiding this comment.
The more I think about it, the more I think it is better to release this today then include it in the plugin BOM release tomorrow
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Require Jenkins 2.479 or newer
JGit 7.0.0 requires Java 17 or newer. Jenkins 2.475 requires Java 17 or newer and includes Jetty 12 and Jakarta EE 9. Jenkins 2.479 includes a security fix and is the baseline for the next LTS.
Require the Jenkins weekly is the baseline for the next LTS.
Would be nice to wait on this release until the plugin BOM is available for 2.479.x so that it can depend on the 2.479.x plugin BOM. That should happen in the plugin BOM release 15 Oct 2024.
Testing done
Interactive testing looks good and automated tests all pass.
Submitter checklist