Skip to content

Fix git 2.51.0 tests and support Java 25 #200

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.

Sign up for GitHub

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
jglick merged 13 commits into from
Sep 22, 2025
Merged

Fix git 2.51.0 tests and support Java 25 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
56393ca
Migrate Commons Lang from 2 to 3 and StringEscapeUtils to Commons Text
gounthar Sep 9, 2025
2d29753
Bump io.jenkins.tools.bom:bom-2.504.x
dependabot[bot] Sep 15, 2025
c99b2a6
Bump io.jenkins.tools.incrementals:git-changelist-maven-extension
dependabot[bot] Sep 15, 2025
19e6500
Bump org.jenkins-ci.plugins:plugin from 5.24 to 5.26
dependabot[bot] Sep 15, 2025
7209fdf
Merge branch 'dependabot/maven/io.jenkins.tools.incrementals-git-chan…
MarkEWaite Sep 21, 2025
374d0a6
Merge branch 'dependabot/maven/org.jenkins-ci.plugins-plugin-5.26' in…
MarkEWaite Sep 21, 2025
c9ff039
Merge branch 'plugin-modernizer/migratecommonslang2tolang3andcommonte…
MarkEWaite Sep 21, 2025
b506ad8
Use plugin BOM 5422.v0fce72a_b_b_8cf
MarkEWaite Sep 21, 2025
86a45de
Require Jenkins 2.504.3, not 2.504.1
MarkEWaite Sep 21, 2025
29784c3
Compile and test on Java 25
MarkEWaite Sep 21, 2025
f5cbad2
Use consistent indentation in pom.xml addition
MarkEWaite Sep 21, 2025
3666d6e
Use spaces, not tabs in pom file
MarkEWaite Sep 21, 2025
ca977f3
Revert "Migrate Commons Lang from 2 to 3 and StringEscapeUtils to Com…
MarkEWaite Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.8</version>
<version>1.13</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ buildPlugin(
configurations: [
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
[platform: 'linux', jdk: 25],
Comment on lines 4 to +6
Copy link
Member

@jglick jglick Nov 22, 2025

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

@MarkEWaite MarkEWaite Nov 22, 2025

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.

])
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>5.24</version>
<version>5.26</version>
<relativePath/>
</parent>
<groupId>io.jenkins.plugins</groupId>
Expand Down Expand Up @@ -65,7 +65,7 @@
<changelist>999999-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
<hpi.bundledArtifacts>ivy</hpi.bundledArtifacts>
Expand All @@ -75,7 +75,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4948.vcf1d17350668</version>
<version>5422.v0fce72a_b_b_8cf</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down