From 6c0b5bdf4ee6b38214c822e03941cb82b9a35f89 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek@geogebra.org>
Date: Thu, 18 Sep 2025 02:02:26 +0200
Subject: [PATCH 01/15] Update dependencies

---
 pom.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 311be44..7492c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,13 @@
     <packaging>hpi</packaging>
 
     <properties>
-        <revision>5.6.0</revision>
+        <revision>6.1.0</revision>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
         <jenkins.baseline>2.479</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-        <hpi.bundledArtifacts>gitlab4j-api</hpi.bundledArtifacts>
+        <hpi.bundledArtifacts>gitlab4j-api,gitlab4j-models</hpi.bundledArtifacts>
         <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
     </properties>
 
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>3893.v213a_42768d35</version>
+                <version>5054.v620b_5d2b_d5e6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -75,7 +75,8 @@
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
-            <artifactId>jersey2-api</artifactId>
+            <artifactId>jersey3-api</artifactId>
+            <version>3.1.11-2.v4a_b_db_cf4557b_</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab4j</groupId>
@@ -128,6 +129,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
+            <version>2.20.0-417.va_5311a_823a_b_8</version>
         </dependency>
     </dependencies>
 
@@ -136,6 +138,10 @@
             <id>repo.jenkins-ci.org</id>
             <url>https://repo.jenkins-ci.org/public/</url>
         </repository>
+        <repository>
+            <id>incrementals</id>
+            <url>https://repo.jenkins-ci.org/incrementals/</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>

From 584f17928fe7ebdaacef9de81f645f7483d68013 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Wed, 8 Oct 2025 20:08:15 +0200
Subject: [PATCH 02/15] Correct plugin name

Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7492c95..94d182f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
             <artifactId>gitlab4j-api</artifactId>
             <version>${revision}</version>
             <exclusions>
-                <!-- Provided by javax-activation-api plugin -->
+                <!-- Provided by jakarta-activation-api plugin -->
                 <exclusion>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>

From 84ab3370a036e25ba4b76c69fb6802e34d6bd120 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Wed, 8 Oct 2025 20:08:30 +0200
Subject: [PATCH 03/15] Correct plugin name

Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 94d182f..9062b27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
                     <groupId>jakarta.servlet</groupId>
                     <artifactId>jakarta.servlet-api</artifactId>
                 </exclusion>
-                <!-- Provided by jersey2-api plugin -->
+                <!-- Provided by jersey3-api plugin -->
                 <exclusion>
                     <groupId>org.glassfish.jersey.connectors</groupId>
                     <artifactId>jersey-apache-connector</artifactId>

From 6d933577c873e1c013b1a1bda08a5b2ff9e16fff Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 9 Oct 2025 02:33:11 +0200
Subject: [PATCH 04/15] Apply suggestion from @alecharp

Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9062b27..7a474c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     <dependencies>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
-            <artifactId>javax-activation-api</artifactId>
+            <artifactId>jakarta-activation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>

From 2def6bc71592e40281cc780812a422e120ee668a Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 16 Oct 2025 00:50:42 +0200
Subject: [PATCH 05/15] Use released version of Jersey3

Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7a474c0..42008b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>jersey3-api</artifactId>
-            <version>3.1.11-2.v4a_b_db_cf4557b_</version>
+            <version>3.1.11-4.v77818819c2e1</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab4j</groupId>

From 50093198f7fb76c2d77ffeba9a0df4510ebc861d Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 16 Oct 2025 00:53:09 +0200
Subject: [PATCH 06/15] Remove incrementals repository from pom.xml

Removed the incrementals repository from the pom.xml file.
---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 42008b9..e2e4027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>jersey3-api</artifactId>
+            <!-- TODO until jersey3-api is in BOM -->
             <version>3.1.11-4.v77818819c2e1</version>
         </dependency>
         <dependency>
@@ -138,10 +139,6 @@
             <id>repo.jenkins-ci.org</id>
             <url>https://repo.jenkins-ci.org/public/</url>
         </repository>
-        <repository>
-            <id>incrementals</id>
-            <url>https://repo.jenkins-ci.org/incrementals/</url>
-        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>

From cb3de5e8110a1ce15cd4419b5ee7a6de37ddff9d Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 16 Oct 2025 02:04:18 +0200
Subject: [PATCH 07/15] Update Jenkins baseline version to 2.504.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b3a8439..0bdf764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <revision>6.1.0</revision>
         <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.3</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.bundledArtifacts>gitlab4j-api,gitlab4j-models</hpi.bundledArtifacts>

From 2dcd3bf903b17b91a377e51daa85873ad7d603e6 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 16 Oct 2025 02:25:52 +0200
Subject: [PATCH 08/15] Update Jenkins baseline version to 2.504

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0bdf764..cbc5471 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <revision>6.1.0</revision>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.504.3</jenkins.baseline>
+        <jenkins.baseline>2.504</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.bundledArtifacts>gitlab4j-api,gitlab4j-models</hpi.bundledArtifacts>

From 78e2a35bf2097ed420c5d8d207d6d69e43f49ac3 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Thu, 16 Oct 2025 02:32:56 +0200
Subject: [PATCH 09/15] Update jackson2-api version in pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cbc5471..6483697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
-            <version>2.20.0-417.va_5311a_823a_b_8</version>
+            <version>2.20.0-420.v8a_08b_d57ca_05</version>
         </dependency>
     </dependencies>
 

From fa6cef27665bf69675af8882218c20d440814be2 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:26:24 -0600
Subject: [PATCH 10/15] Rely on plugin versions from newest plugin BOM

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6483697..81e33ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>5473.vb_9533d9e5d88</version>
+                <version>5577.vea_979d35b_b_ff</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -76,8 +76,6 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>jersey3-api</artifactId>
-            <!-- TODO until jersey3-api is in BOM -->
-            <version>3.1.11-4.v77818819c2e1</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab4j</groupId>
@@ -130,7 +128,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
-            <version>2.20.0-420.v8a_08b_d57ca_05</version>
         </dependency>
     </dependencies>
 

From 1a8bcafe311f38c98c5563269c2103e22840381c Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:26:56 -0600
Subject: [PATCH 11/15] Remove unused test library exclusion

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81e33ea..77c0cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,11 +113,6 @@
                     <groupId>org.glassfish.jersey.media</groupId>
                     <artifactId>jersey-media-multipart</artifactId>
                 </exclusion>
-                <!-- TODO Unneeded test library https://github.com/gitlab4j/gitlab4j-api/pull/840 -->
-                <exclusion>
-                    <groupId>uk.org.webcompere</groupId>
-                    <artifactId>system-stubs-jupiter</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <!-- Needed by jersey-apache-connector, but jersey2-api plugin declares it as optional -->

From 6e3e4a95f6e99cd947d8ef89f341213156b87ff4 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:28:42 -0600
Subject: [PATCH 12/15] Use a better issue management URL

Copied from https://plugins.jenkins.io/gitlab-api/
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 77c0cbb..830e583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
     <issueManagement>
-        <url>https://issues.jenkins-ci.org/browse/JENKINS-57445?jql=project%20%3D%20JENKINS%20AND%20component%20%3D%20gitlab-api-plugin</url>
+        <url>https://issues.jenkins.io/issues/?jql=resolution%20is%20EMPTY%20and%20component%3D25128</url>
         <system>JIRA</system>
     </issueManagement>
 

From 41a1e2a68b2d4723cc050dfe59c317b97cd9234a Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:33:31 -0600
Subject: [PATCH 13/15] Remove exclusion of jakarta activation API plugin

Not needed
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 830e583..466eaf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>gitlab4j-api</artifactId>
             <version>${revision}</version>
             <exclusions>
-                <!-- Provided by jakarta-activation-api plugin -->
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
                 <!-- Provided by core -->
                 <exclusion>
                     <groupId>jakarta.servlet</groupId>

From 96580e5b8fe4f1618007aa1ddaf4fa86fb399f77 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:34:08 -0600
Subject: [PATCH 14/15] Rely of transitive dependency for
 apache-httpcomponents-client-4-api

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 466eaf4..202d75a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,11 +110,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Needed by jersey-apache-connector, but jersey2-api plugin declares it as optional -->
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>apache-httpcomponents-client-4-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>

From 711d0eda59a87b1a6b67feee1e040ccc01c108c1 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 23 Oct 2025 12:47:54 -0600
Subject: [PATCH 15/15] Remove unnecessary jersey exclusions

---
 pom.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 202d75a..2b8c5ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,26 +88,10 @@
                     <artifactId>jakarta.servlet-api</artifactId>
                 </exclusion>
                 <!-- Provided by jersey3-api plugin -->
-                <exclusion>
-                    <groupId>org.glassfish.jersey.connectors</groupId>
-                    <artifactId>jersey-apache-connector</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.glassfish.jersey.core</groupId>
                     <artifactId>jersey-client</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.inject</groupId>
-                    <artifactId>jersey-hk2</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.media</groupId>
-                    <artifactId>jersey-media-json-jackson</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.media</groupId>
-                    <artifactId>jersey-media-multipart</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>