Skip to content

[JENKINS-75058] Merge with master #1

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
merged 30 commits into from
Aug 19, 2025
Merged

[JENKINS-75058] Merge with master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3d7eb3e
Use `jenkins.baseline` to reduce bom update mistakes (#824)
strangelookingnerd Jan 14, 2025
088b5f2
Update BOM, update to Jakarta (#823)
janfaracik Jan 14, 2025
9133112
Migrate from EE 8 to EE 9 (#825)
basil Jan 20, 2025
611ea6a
Bump org.jenkins-ci.plugins:plugin from 5.5 to 5.9 (#837)
dependabot[bot] Mar 14, 2025
d386724
[JENKINS-75471] Add test to reproduce exception in SCMSource observer
Dohbedoh Mar 24, 2025
5e36d7c
[JENKINS-75471] Add test to reproduce exception in SCMSource observer
Dohbedoh Mar 25, 2025
b3c14ff
[JENKINS-75471] Catch IOException
Dohbedoh Mar 27, 2025
9152b2f
Merge pull request #840 from Dohbedoh/JENKINS-75471
jglick Mar 27, 2025
ffcfdcf
Bump org.jenkins-ci.plugins:plugin from 5.9 to 5.10
dependabot[bot] Apr 8, 2025
29c7286
Migrate from com.github.tomakehurst to org.wiremock
strangelookingnerd Apr 9, 2025
1e8ec9c
Merge pull request #844 from strangelookingnerd/patch-1
jglick Apr 10, 2025
18a36f9
Merge pull request #843 from jenkinsci/dependabot/maven/org.jenkins-c…
jglick Apr 10, 2025
fa7d412
Bump org.jenkins-ci.plugins:plugin from 5.10 to 5.12 (#849)
dependabot[bot] Apr 28, 2025
8eca776
Fixed issue while validating the multibranch pipeline configuration o…
vwagh-dev May 29, 2025
9eec8e5
Merge pull request #860 from vwagh-dev/JENKINS-73474-followup
jglick May 30, 2025
86d11d6
Use symbol for scm navigator
mawinter69 Jun 5, 2025
0462572
Merge pull request #862 from mawinter69/icon
jglick Jun 20, 2025
85cd485
Remove useBeta property from pom.xml
strangelookingnerd Jan 22, 2025
9c75558
Bump jenkins.version to 2.495
strangelookingnerd Jan 29, 2025
be6cae1
Bump baseline and bom
strangelookingnerd Jun 26, 2025
989b4dd
Merge pull request #828 from strangelookingnerd/remove_use_beta
jglick Jun 26, 2025
185c898
[JENKINS-73791] Prevent PR 404 on details to break Branches scan (#811)
Dohbedoh Jul 18, 2025
f4fba8a
Bump org.wiremock:wiremock-standalone from 3.12.1 to 3.13.1
dependabot[bot] Jun 12, 2025
8146a4c
Bump org.jenkins-ci.plugins:plugin from 5.12 to 5.18
dependabot[bot] Jul 1, 2025
ce7905e
Bump org.awaitility:awaitility from 4.2.2 to 4.3.0
dependabot[bot] Jul 18, 2025
77b6542
Upgrade Commons Lang from 2 to 3 (#874)
basil Jul 30, 2025
857721e
[JENKINS-75704] Fix Copilot user null name/email handling (#864)
IvanGasant Jul 31, 2025
68f4865
Bump org.jenkins-ci.plugins:plugin from 5.18 to 5.19
dependabot[bot] Aug 11, 2025
470e081
Merge branch 'dynamic-installation-access-token-restrictions'
jeromepochat Aug 19, 2025
f7e0ff1
Suppressing unnecessary annotation
jeromepochat Aug 19, 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
29 changes: 17 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.19</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -33,17 +33,18 @@
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
<jenkins.version>2.440.3</jenkins.version>
<useBeta>true</useBeta>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<spotless.check.skip>false</spotless.check.skip>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.440.x</artifactId>
<version>3234.v5ca_5154341ef</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4948.vcf1d17350668</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -59,6 +60,10 @@
<groupId>io.jenkins.plugins</groupId>
<artifactId>caffeine-api</artifactId>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-lang3-api</artifactId>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>ionicons-api</artifactId>
Expand All @@ -83,12 +88,6 @@
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<version>2.35.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
Expand All @@ -107,7 +106,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.2</version>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -137,6 +136,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.jenkinsci.plugins.github_branch_source;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Util;
import hudson.model.TaskListener;
import hudson.util.LogTaskListener;
Expand All @@ -12,13 +11,12 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.github.config.GitHubServerConfig;
import org.kohsuke.github.GHRateLimit;
import org.kohsuke.github.GitHub;
import org.kohsuke.github.RateLimitChecker;

@SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") // https://github.com/spotbugs/spotbugs/issues/1539
public enum ApiRateLimitChecker {

/** Attempt to evenly distribute GitHub API requests. */
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/Connector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
import jenkins.util.SystemProperties;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.gitclient.GitClient;
import org.jenkinsci.plugins.github.config.GitHubServerConfig;
import org.kohsuke.github.GHAppInstallationToken;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/Endpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import java.util.logging.Logger;
import jenkins.model.Jenkins;
import jenkins.scm.api.SCMName;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.github.GitHub;
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/FillErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.jenkinsci.plugins.github_branch_source;

import hudson.Util;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

// TODO replace with corresponding core functionality once Jenkins core has JENKINS-42443
class FillErrorResponse extends IOException implements HttpResponse {
Expand All @@ -20,8 +19,7 @@ public FillErrorResponse(String message, boolean clearList) {
}

@Override
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
throws IOException, ServletException {
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException {
rsp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
rsp.setContentType("text/html;charset=UTF-8");
rsp.setHeader("X-Jenkins-Select-Error", clearList ? "clear" : "retain");
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ public class GitHubAppCredentials extends BaseStandardCredentials implements Sta

private String apiUri;

@SuppressFBWarnings(value = "IS2_INCONSISTENT_SYNC", justification = "#withOwner locking only for #byOwner")
Copy link
Author

@jeromepochat jeromepochat Aug 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

note: Removed as the build was failing :

[INFO] --- spotbugs:4.9.3.2:check (spotbugs) @ github-branch-source ---
[INFO] BugInstance size is 1
[INFO] Error size is 0
[INFO] Total bugs: 1
[ERROR] Medium: Suppressing annotation on the field org.jenkinsci.plugins.github_branch_source.GitHubAppCredentials.owner is unnecessary [org.jenkinsci.plugins.github_branch_source.GitHubAppCredentials] In GitHubAppCredentials.java US_USELESS_SUPPRESSION_ON_FIELD

@Deprecated
private String owner;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
import jenkins.model.GlobalConfiguration;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.StaplerRequest;
import org.apache.commons.lang3.StringUtils;
import org.kohsuke.stapler.StaplerRequest2;

@Extension
public class GitHubConfiguration extends GlobalConfiguration {
Expand All @@ -60,7 +60,7 @@ public GitHubConfiguration() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
req.bindJSON(this, json);
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubOrgMetadataAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import java.io.ObjectStreamException;
import java.util.Objects;
import jenkins.scm.api.metadata.AvatarMetadataAction;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.kohsuke.github.GHUser;
import org.kohsuke.stapler.Stapler;

Expand Down Expand Up @@ -76,7 +76,7 @@ public String getAvatarImageOf(String size) {
String image = avatarIconClassNameImageOf(getAvatarIconClassName(), size);
return image != null
? image
: (Stapler.getCurrentRequest().getContextPath()
: (Stapler.getCurrentRequest2().getContextPath()
+ Hudson.RESOURCE_PATH
+ "/plugin/github-branch-source/images/"
+ "/github-logo.svg");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepositoryInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

package org.jenkinsci.plugins.github_branch_source;

import static org.apache.commons.lang.StringUtils.removeEnd;
import static org.apache.commons.lang3.StringUtils.removeEnd;
import static org.jenkinsci.plugins.github_branch_source.GitHubSCMSource.GITHUB_COM;

import edu.umd.cs.findbugs.annotations.NonNull;
import java.net.MalformedURLException;
import java.net.URL;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

/**
* Used to compute values for GitHubSCMSource from a user-specified repository URL.
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.model.Item;
import hudson.model.Queue;
import hudson.plugins.git.GitSCM;
Expand All @@ -49,7 +48,7 @@
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.SCMSourceOwner;
import jenkins.scm.api.mixin.TagSCMHead;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.transport.RefSpec;
import org.jenkinsci.plugins.github.config.GitHubServerConfig;
Expand All @@ -59,7 +58,6 @@
*
* @since 2.2.0
*/
@SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") // https://github.com/spotbugs/spotbugs/issues/1539
public class GitHubSCMBuilder extends GitSCMBuilder<GitHubSCMBuilder> {

private static final Random ENTROPY = new Random();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.SCMSourceDescriptor;
import org.apache.commons.lang.time.FastDateFormat;
import org.apache.commons.lang3.time.FastDateFormat;
import org.kohsuke.github.GHCommit;
import org.kohsuke.github.GHRef;
import org.kohsuke.github.GHRepository;
Expand Down
Loading