Skip to content
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

Require Jenkins 2.479 or newer #1172

Merged
merged 40 commits into from
Oct 10, 2024
Merged

Require Jenkins 2.479 or newer #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
c14430c
Test JGit 7.0.0-m2 pre-release with Java 17 build
MarkEWaite Aug 7, 2024
7f33b16
Test JGit 7.0.0 with Jakarta EE 9 Jenkins core
MarkEWaite Aug 7, 2024
d9ef6d2
Merge branch 'master' into test-jgit-7.0.0
Aug 23, 2024
de63f62
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Aug 23, 2024
42b7533
Use JGit 7.0.0.202408202050-m3 pre-release
MarkEWaite Aug 23, 2024
1272adc
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Aug 23, 2024
1527459
Merge branch 'master' into test-jgit-7.0.0
MarkEWaite Aug 27, 2024
890c0b8
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Aug 27, 2024
1fb75a3
Merge branch 'master' into test-jgit-7.0.0
MarkEWaite Sep 5, 2024
3398faa
Use JGit 7.0.0.202409031743-r
MarkEWaite Sep 5, 2024
8f47f3c
Adapt to removed API's in JGit 7.0.0
MarkEWaite Sep 5, 2024
0a30ea6
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 5, 2024
15c3bdc
Use test harness 2265.x
Sep 6, 2024
480ce4b
Next Jenkins baseline will be a .1
Sep 6, 2024
c8d24d2
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
Sep 6, 2024
e81905e
Merge branch 'test-jgit-7.0.0-with-jakarta-ee-9' of github.com:MarkEW…
MarkEWaite Sep 6, 2024
1189a30
Use JGit 7.0.0 with Java 17
MarkEWaite Aug 7, 2024
8cbab98
Merge branch 'master' into test-jgit-7.0.0
MarkEWaite Sep 12, 2024
ef1a30d
Merge branch 'test-jgit-7.0.0' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 12, 2024
dfd8fe7
Use 6.1.0 as version
MarkEWaite Sep 12, 2024
9ab0ff9
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 12, 2024
086160a
Use Java 17 features in source code
MarkEWaite Sep 13, 2024
c938624
Merge branch 'use-java-17-source-code' into test-jgit-7.0.0-with-jaka…
MarkEWaite Sep 13, 2024
2654136
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 13, 2024
79858bb
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 13, 2024
8705589
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 18, 2024
da6c15f
Require Jenkins 2.477
MarkEWaite Sep 18, 2024
62ddbe0
Use test harness that drops EE 8
MarkEWaite Sep 18, 2024
c9596fd
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 20, 2024
6da4ecd
Use Jenkins test harness 2289.x
MarkEWaite Sep 20, 2024
51b1c07
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
Sep 23, 2024
500dafa
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Sep 28, 2024
077f7d6
Use test harness 2299.*
MarkEWaite Sep 28, 2024
a552071
Use parent pom 5.0
MarkEWaite Oct 3, 2024
4bcca7e
Security scan not ready for Java 17 and Jakarta EE 9
MarkEWaite Oct 3, 2024
9e221f6
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Oct 4, 2024
88a4d4b
Use parent pom 5.1
MarkEWaite Oct 7, 2024
7720f48
Revert "Security scan not ready for Java 17 and Jakarta EE 9"
MarkEWaite Oct 7, 2024
33d0163
Use StaplerRequest2 for EE 9
MarkEWaite Oct 9, 2024
a1b6883
Merge branch 'master' into test-jgit-7.0.0-with-jakarta-ee-9
MarkEWaite Oct 10, 2024
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
8 changes: 3 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
</scm>

<properties>
<revision>6.0.1</revision>
<revision>6.1.0</revision>
<changelist>-SNAPSHOT</changelist>
<!-- Character set tests fail unless file.encoding is set -->
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
Expand All @@ -62,10 +62,8 @@
<jenkins.baseline>2.462</jenkins.baseline>
<!-- TODO Replace with the standard jenkins.baseline references after LTS requires Java 17 -->
<!-- <jenkins.version>${jenkins.baseline}.1</jenkins.version> -->
Comment on lines 63 to 64
Copy link
Member

Choose a reason for hiding this comment

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

jenkinsci/bom#3677 IIUC

Copy link
Contributor Author

Choose a reason for hiding this comment

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

BOM will release Friday, then I plan to release the git client plugin 6.1.0 using that new plugin BOM release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

<jenkins.version>2.463</jenkins.version>
<jenkins.version>2.479</jenkins.version>
<jgit.version>7.0.0.202409031743-r</jgit.version>
<!-- TODO JENKINS-73339 until in parent POM -->
<maven.compiler.release>17</maven.compiler.release>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotless.check.skip>false</spotless.check.skip>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/git/GitTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.interceptor.RequirePOST;

/**
Expand Down Expand Up @@ -153,7 +153,7 @@ public String getDisplayName() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject json) {
public boolean configure(StaplerRequest2 req, JSONObject json) {
setInstallations(req.bindJSONToList(clazz, json.get("tool")).toArray(new GitTool[0]));
save();
return true;
Expand Down