Skip to content

Fix git 2.51.0 tests and support Java 25#200

Merged
jglick merged 13 commits intojenkinsci:masterfrom
MarkEWaite:octopus
Sep 22, 2025
Merged

Fix git 2.51.0 tests and support Java 25#200
jglick merged 13 commits intojenkinsci:masterfrom
MarkEWaite:octopus

Conversation

@MarkEWaite
Copy link
Contributor

@MarkEWaite MarkEWaite commented Sep 21, 2025

Fix git 2.51.0 tests and support Java 25

Git client plugin update is needed for support of command line git 2.51.0. Without this fix, automated tests will fail on ci.jenkins.io . Update the plugin BOM version to use the most recent git client plugin release.

Require Jenkins 2.504.3, not 2.504.1. One of the dependencies requires it. Also recommended by Jenkins documentation

Migrate Commons Lang from 2 to 3 and StringEscapeUtils to Commons Text because it reduces references to Commons Lang 2.

Includes pull requests:

Replaces pull request:

Testing done

Confirmed that tests pass with Java 25.

Submitter checklist

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

gounthar and others added 11 commits September 9, 2025 19:25
Bumps [io.jenkins.tools.bom:bom-2.504.x](https://github.com/jenkinsci/bom) from 4948.vcf1d17350668 to 5388.v3ea_2e00a_719a_.
- [Release notes](https://github.com/jenkinsci/bom/releases)
- [Commits](https://github.com/jenkinsci/bom/commits)

---
updated-dependencies:
- dependency-name: io.jenkins.tools.bom:bom-2.504.x
  dependency-version: 5388.v3ea_2e00a_719a_
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [io.jenkins.tools.incrementals:git-changelist-maven-extension](https://github.com/jenkinsci/incrementals-tools) from 1.8 to 1.13.
- [Release notes](https://github.com/jenkinsci/incrementals-tools/releases)
- [Commits](jenkinsci/incrementals-tools@parent-1.8...parent-1.13)

---
updated-dependencies:
- dependency-name: io.jenkins.tools.incrementals:git-changelist-maven-extension
  dependency-version: '1.13'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.24 to 5.26.
- [Release notes](https://github.com/jenkinsci/plugin-pom/releases)
- [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md)
- [Commits](jenkinsci/plugin-pom@plugin-5.24...plugin-5.26)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:plugin
  dependency-version: '5.26'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
One of the dependencies requires it

Also recommended by Jenkins documentation
@jglick jglick merged commit 1300881 into jenkinsci:master Sep 22, 2025
17 checks passed
@MarkEWaite MarkEWaite deleted the octopus branch September 22, 2025 22:09
Comment on lines 4 to +6
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
[platform: 'linux', jdk: 25],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you added a third branch, rather than switching to Linux on 25 and Windows on 21 as has been done for so many other plugins?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you added a third branch, rather than switching to Linux on 25 and Windows on 21 as has been done for so many other plugins?

When this was created 2 months ago I was not confident that others would accept the removal of Java 17. I've submitted a pull request to make this plugin similar to other plugins.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants