Use JGit 7.0.0, require Java 17 and Jenkins 2.463 or newer #1170
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
2 times, most recently
from
3b8f18e to
b97ab86
Compare
MarkEWaite
force-pushed
the
test-jgit-7.0.0
branch
3 times, most recently
from
6bfa95c to
c14430c
Compare
MarkEWaite
added a commit
to MarkEWaite/docker-lfs
that referenced
this pull request
Aug 23, 2024
jenkinsci/git-client-plugin#1170 Test JGit 7.0.0 with Java 17 JGit 7.0.0.202408202050-m3
6 tasks
MarkEWaite
added a commit
to MarkEWaite/docker-lfs
that referenced
this pull request
Sep 10, 2024
jenkinsci/git-client-plugin#1170 JGit 7.0.0 with Java 17
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
MarkEWaite
force-pushed
the
test-jgit-7.0.0
branch
from
480ce4b to
1189a30
Compare
MarkEWaite
changed the title
|
@jenkinsci/git-client-plugin-developers could you review and comment as necessary on this pull request? I would like to merge and release this change by the end of this week. I've been testing JGit 7.0.0 pre-releases for a long time. Now that JGit 7.0.0 is released, I'd prefer to include it in the git client plugin. The release with JGit 7.0.0 won't be shown to LTS users until the 30 Oct 2024 LTS release that requires Java 17. |
MarkEWaite
changed the title
olamy
approved these changes
Sep 12, 2024
6 tasks
|
This change should have been preceded by a thorough review of the consumers of the JGit API within the Jenkins plugins. I've run a preliminary review using usage in plugins with the following signatures: That set of removed method signatures leads to the following detected issues and their matching fixes:
The change also broke the git-changelog plugin but the break is not detected by usage in plugins because the git-changelog plugin uses a library that references JGit 6.x methods. Git changelog issue is: Users of the git changelog plugin will need to remain with git client 5.0.0 and JGit 6.10.0 until they upgrade to a Jenkins version that requires Java 17 or newer. The git changelog plugin will require Java 17 or newer in an upcoming release because it depends on two libraries (Eclipse JGit 7.0.0 and Java Handlebars) that require Java 17. |
Merged
6 tasks
MarkEWaite
added a commit
to MarkEWaite/last-changes-plugin
that referenced
this pull request
Sep 16, 2024
https://issues.jenkins.io/browse/JENKINS-73781 notes that JGit deprecated peel() in favor of getRefDatabase().peel() a long time ago. The deprecated method was removed from JGit 7.0.0. This uses the replacement method that has been available since the deprecation. jenkinsci/git-client-plugin#1170 is the git client plugin pull request that introduced JGit 7.0.0. https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-6.0.0 is the git client plugin release that introduced JGit 7.0.0.
6 tasks
|
Looks like these changes break |
Unfortunately, there is not much that I can do about that issue. The class The changes in the git client plugin to adapt to JGit 7.0.0 were not large, but they did require changes. The most direct workaround is to remain with Git client plugin 5.0.0 and not upgrade to Git client plugin 6.0.0 until a new version of git changelog plugin is released that has been adapted to replace the deprecated use of |
Git changelog plugin has updated the dependent library and released a new version. Users running a recent Jenkins weekly can upgrade to the new git changelog plugin version. Users running Jenkins LTS 2.462.x won't see the issue because they are not offered git client plugin 6.0.0. |
|
I confirm that issue with |
3 tasks
basil
reviewed
Oct 30, 2024
| <jenkins.version>${jenkins.baseline}.3</jenkins.version> | ||
| <jgit.version>6.10.0.202406032230-r</jgit.version> | ||
| <jenkins.baseline>2.462</jenkins.baseline> | ||
| <!-- TODO Replace with the standard jenkins.baseline references after LTS requires Java 17 --> |
There was a problem hiding this comment.
Thanks. Completed in:
MarkEWaite
added a commit
to MarkEWaite/last-changes-plugin
that referenced
this pull request
Nov 23, 2024
https://issues.jenkins.io/browse/JENKINS-73781 notes that JGit deprecated peel() in favor of getRefDatabase().peel() a long time ago. The deprecated method was removed from JGit 7.0.0. This uses the replacement method that has been available since the deprecation. jenkinsci/git-client-plugin#1170 is the git client plugin pull request that introduced JGit 7.0.0. https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-6.0.0 is the git client plugin release that introduced JGit 7.0.0.
rmpestano
pushed a commit
to jenkinsci/last-changes-plugin
that referenced
this pull request
Nov 23, 2024
https://issues.jenkins.io/browse/JENKINS-73781 notes that JGit deprecated peel() in favor of getRefDatabase().peel() a long time ago. The deprecated method was removed from JGit 7.0.0. This uses the replacement method that has been available since the deprecation. jenkinsci/git-client-plugin#1170 is the git client plugin pull request that introduced JGit 7.0.0. https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-6.0.0 is the git client plugin release that introduced JGit 7.0.0.
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.
Use JGit 7.0.0, require Java 17 and Jenkins 2.463 or newer
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.
Checklist
Types of changes
What types of changes does your code introduce? Put an
xin the boxes that apply