Skip to content

Migrate gitlab api from 5 to 6 #511

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

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Migrate gitlab api from 5 to 6 #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67dab87
Bump gitlab-api from 5.8.1-106.vef1de800710e from 6.1.0-106.v6c0b_5b_…
alecharp Oct 2, 2025
27ed2ac
Migrates classes from GitLab API 5 to 6
alecharp Oct 2, 2025
2e4e99e
Bump Jackson2 API plugin from 2.20.0-417.va_5311a_823a_b_8 to 2.20.0-…
alecharp Oct 13, 2025
b665397
Bump GitLab API plugin from 6.1.0-106.v6c0b_5b_df4ee6 to 6.1.0-109.v6…
alecharp Oct 13, 2025
deee82c
Bump jenkins.version from 2.479.3 to 2.504.3
alecharp Oct 16, 2025
0deb58b
Bump bom version from 5473.vb_9533d9e5d88 to 5543.vfd758c7c868d
alecharp Oct 16, 2025
1103845
Puts gitlab-api plugin version in dependency management
alecharp Oct 16, 2025
a0786f1
Bump gitlab-api from 6.1.0-109.v6d933577c873 to 6.1.0-118.v78e2a_35b_…
alecharp Oct 17, 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
11 changes: 8 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.492</jenkins.baseline>
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<spotless.check.skip>false</spotless.check.skip>
Expand All @@ -46,10 +46,16 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>5054.v620b_5d2b_d5e6</version>
<version>5543.vfd758c7c868d</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO https://github.com/jenkinsci/gitlab-api-plugin/pull/121/ -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>gitlab-api</artifactId>
<version>6.1.0-118.v78e2a_35b_f209</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -61,7 +67,6 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>gitlab-api</artifactId>
<version>5.8.1-106.vef1de800710e</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@
import jenkins.scm.impl.trait.Discovery;
import jenkins.scm.impl.trait.Selection;
import org.apache.commons.lang3.StringUtils;
import org.gitlab4j.api.Constants;
import org.gitlab4j.api.Constants.MergeRequestState;
import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.models.AccessLevel;
Expand All @@ -96,6 +94,8 @@
import org.gitlab4j.api.models.Project;
import org.gitlab4j.api.models.ProjectFilter;
import org.gitlab4j.api.models.Tag;
import org.gitlab4j.models.Constants;
import org.gitlab4j.models.Constants.MergeRequestState;
import org.jenkins.ui.icon.IconSpec;
import org.jenkinsci.Symbol;
import org.jenkinsci.plugins.gitclient.GitClient;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import jenkins.scm.api.SCMEvent;
import org.apache.commons.lang3.StringUtils;
import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.systemhooks.SystemHookManager;
import org.gitlab4j.api.SystemHookManager;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

@Extension
Expand Down Expand Up @@ -81,8 +80,8 @@
String origin = SCMEvent.originOf(request);
SystemHookManager systemHookManager = new SystemHookManager();
systemHookManager.addListener(new GitLabSystemHookListener(origin));
systemHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
systemHookManager.handleEvent(request);

Check warning on line 83 in src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 83 is not covered by tests
return HttpResponses.ok(); // TODO find a better response

Check warning on line 84 in src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java

View check run for this annotation

ci.jenkins.io / Open Tasks Scanner

TODO 

NORMAL:
find a better response
}

@SuppressFBWarnings(
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
import jenkins.scm.api.SCMEvent;
import org.apache.commons.lang3.StringUtils;
import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.webhook.WebHookManager;
import org.gitlab4j.api.WebHookManager;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

@Extension
Expand Down Expand Up @@ -81,8 +80,8 @@
String origin = SCMEvent.originOf(request);
WebHookManager webHookManager = new WebHookManager();
webHookManager.addListener(new GitLabWebHookListener(origin));
webHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
webHookManager.handleEvent(request);

Check warning on line 83 in src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 83 is not covered by tests
return HttpResponses.ok(); // TODO find a better response

Check warning on line 84 in src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java

View check run for this annotation

ci.jenkins.io / Open Tasks Scanner

TODO 

NORMAL:
find a better response
}

@SuppressFBWarnings(
Expand Down