[JENKINS-73781] Make plugin compatible with git client 5.0.0 and 6.0.0

MarkEWaite commented 2 months ago

[JENKINS-73781] Make plugin compatible with git client 5.0.0 and 6.0.0

Replaces JGit peel() with getRefDatabase().peel()

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. This change works with both the older JGit versions (6.x) and the most recent JGit 7.0.0 release.

The git client plugin pull request that introduced JGit 7.0.0 is:

https://github.com/jenkinsci/git-client-plugin/pull/1170

Git client plugin 6.0.0 is the git client plugin release that introduced JGit 7.0.0.

The test that is failing on the master branch has been updated to use the same pattern as another test in the same file. Assembla now requires authenticated access for their Subversion repositories. The shouldGetLastChangesFromLatestTag test already used this same technique to only run the test when the PASS system property is provided. Make shouldGetLastChanges the same as shouldGetLastChangesFromLatestTag.

This change ignores shouldGetLastChanges on ci.jenkins.io in the same way that shouldGetLastChangesFromLatestTag was already ignored, since the PASS property is not set on ci.jenkins.io.

Testing done

Automated tests pass. No interactive testing has been performed because the changes are minor. The same change was applied to the git client plugin when it transitioned from JGit 6.10.0 to JGit 7.0.0 and all tests were passing with git client plugin.

Submitter checklist

[x] Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
[x] Ensure that the pull request title represents the desired changelog entry
[x] Please describe what you did
[x] Link to relevant issues in GitHub or Jira
[x] Link to relevant pull requests, esp. upstream and downstream changes
[x] Ensure you have provided tests - that demonstrates feature works or fixes the issue

MarkEWaite commented 1 month ago

@rmpestano this needs to be merged and released so that users who install Jenkins 2.463 or later do not see a last changes plugin regression due to the JGit 7.0.0 changes that are included in Git client plugin 6.0.0 and later. The changes are compatible with earlier versions of the git client plugin as well, so should be very low risk for users.

Are you available to merge and release it?

rmpestano commented 1 week ago

@MarkEWaite thanks for stepping in, are you able to release? I don't think I have the maven setup to do that anymore

MarkEWaite commented 1 week ago

@MarkEWaite thanks for stepping in, are you able to release? I don't think I have the maven setup to do that anymore

I'm not yet able to release, but will be able to release very soon, once the processing is completed from the merged pull request:

https://github.com/jenkins-infra/repository-permissions-updater/pull/4191

jenkinsci / last-changes-plugin