From 67dab876c3656d5baff547ac3f8e53e6256b4c0f Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 2 Oct 2025 15:09:24 +0200 Subject: [PATCH 1/8] Bump gitlab-api from 5.8.1-106.vef1de800710e from 6.1.0-106.v6c0b_5b_df4ee6 --- pom.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1ef01d1f..618e2331 100644 --- a/pom.xml +++ b/pom.xml @@ -46,10 +46,16 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 5054.v620b_5d2b_d5e6 + 5473.vb_9533d9e5d88 pom import + + + org.jenkins-ci.plugins + jackson2-api + 2.20.0-417.va_5311a_823a_b_8 + @@ -59,9 +65,10 @@ commons-lang3-api + io.jenkins.plugins gitlab-api - 5.8.1-106.vef1de800710e + 6.1.0-106.v6c0b_5b_df4ee6 org.jenkins-ci.plugins From 27ed2acdd25fe552e8a6dd53f388f461a218b0ac Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 2 Oct 2025 15:10:07 +0200 Subject: [PATCH 2/8] Migrates classes from GitLab API 5 to 6 --- .../jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java | 4 ++-- .../plugins/gitlabbranchsource/GitLabSystemHookAction.java | 5 ++--- .../plugins/gitlabbranchsource/GitLabWebHookAction.java | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java index 3e65766d..b22694f0 100644 --- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java +++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java @@ -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; @@ -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; diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java index cfa180c1..17273a52 100644 --- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java +++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java @@ -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 @@ -81,7 +80,7 @@ public HttpResponse doPost(StaplerRequest2 request) throws GitLabApiException { String origin = SCMEvent.originOf(request); SystemHookManager systemHookManager = new SystemHookManager(); systemHookManager.addListener(new GitLabSystemHookListener(origin)); - systemHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request)); + systemHookManager.handleEvent(request); return HttpResponses.ok(); // TODO find a better response } diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java index ad23ed60..0e8d80bb 100644 --- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java +++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java @@ -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 @@ -81,7 +80,7 @@ public HttpResponse doPost(StaplerRequest2 request) throws IOException, GitLabAp String origin = SCMEvent.originOf(request); WebHookManager webHookManager = new WebHookManager(); webHookManager.addListener(new GitLabWebHookListener(origin)); - webHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request)); + webHookManager.handleEvent(request); return HttpResponses.ok(); // TODO find a better response } From 2e4e99ec288ab7c3b56223df114033e1b5314bf8 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Mon, 13 Oct 2025 17:41:54 +0200 Subject: [PATCH 3/8] Bump Jackson2 API plugin from 2.20.0-417.va_5311a_823a_b_8 to 2.20.0-420.v8a_08b_d57ca_05 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 618e2331..cf0bd7ac 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ org.jenkins-ci.plugins jackson2-api - 2.20.0-417.va_5311a_823a_b_8 + 2.20.0-420.v8a_08b_d57ca_05 From b665397ec8a9831dda0b4a46498276c767dd4831 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Mon, 13 Oct 2025 17:42:33 +0200 Subject: [PATCH 4/8] Bump GitLab API plugin from 6.1.0-106.v6c0b_5b_df4ee6 to 6.1.0-109.v6d933577c873 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf0bd7ac..5f6dc4ad 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ io.jenkins.plugins gitlab-api - 6.1.0-106.v6c0b_5b_df4ee6 + 6.1.0-109.v6d933577c873 org.jenkins-ci.plugins From deee82c1b5e8a37c22f8ca49c6eb97058ab37b19 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 16 Oct 2025 16:03:54 +0200 Subject: [PATCH 5/8] Bump jenkins.version from 2.479.3 to 2.504.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f6dc4ad..450cdc86 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 999999-SNAPSHOT - 2.492 + 2.504 ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin false From 0deb58b9ef42ad5fe5fd0b82e490e66bab141a93 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 16 Oct 2025 16:04:48 +0200 Subject: [PATCH 6/8] Bump bom version from 5473.vb_9533d9e5d88 to 5543.vfd758c7c868d --- pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 450cdc86..b8f0fc17 100644 --- a/pom.xml +++ b/pom.xml @@ -46,16 +46,10 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 5473.vb_9533d9e5d88 + 5543.vfd758c7c868d pom import - - - org.jenkins-ci.plugins - jackson2-api - 2.20.0-420.v8a_08b_d57ca_05 - From 110384587293ec7a7d83dfe9f0ee434f8c037c6e Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 16 Oct 2025 16:06:24 +0200 Subject: [PATCH 7/8] Puts gitlab-api plugin version in dependency management --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b8f0fc17..772be68e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,12 @@ pom import + + + io.jenkins.plugins + gitlab-api + 6.1.0-109.v6d933577c873 + @@ -59,10 +65,8 @@ commons-lang3-api - io.jenkins.plugins gitlab-api - 6.1.0-109.v6d933577c873 org.jenkins-ci.plugins From a0786f1f2b1049336af48be9bc84fdd6e4cdd74e Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Fri, 17 Oct 2025 10:38:01 +0200 Subject: [PATCH 8/8] Bump gitlab-api from 6.1.0-109.v6d933577c873 to 6.1.0-118.v78e2a_35b_f209 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 772be68e..a91d90aa 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ io.jenkins.plugins gitlab-api - 6.1.0-109.v6d933577c873 + 6.1.0-118.v78e2a_35b_f209