From ad151597e7331aa8e052aff160de145ee60f87bb Mon Sep 17 00:00:00 2001
From: Stefan Spieker <S.Spieker@gmx.net>
Date: Thu, 4 Apr 2024 14:37:41 +0200
Subject: [PATCH 1/2] use gson-api and update to Jenkins 2.401.3, plugin to
 4.80 and minor improvements

---
 package-lock.json |  6 +++---
 pom.xml           | 31 ++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 36e86f5f..96b4ded0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1332,9 +1332,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
diff --git a/pom.xml b/pom.xml
index 49dabc6f..8b5b911f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.74</version>
+        <version>4.80</version>
     </parent>
 
     <artifactId>azure-ad</artifactId>
@@ -36,9 +36,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jenkins.version>2.387.3</jenkins.version>
-        <node.version>18.12.1</node.version>
-        <npm.version>8.19.2</npm.version>
+        <jenkins.version>2.401.3</jenkins.version>
+        <node.version>20.12.1</node.version>
+        <npm.version>10.5.0</npm.version>
         <hpi.compatibleSinceVersion>391.v252da_e1dd39c</hpi.compatibleSinceVersion>
 
         <checkstyle.skip>true</checkstyle.skip>
@@ -103,6 +103,14 @@
                     <groupId>com.azure</groupId>
                     <artifactId>azure-identity</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
                 <!-- Comes from Azure SDK plugin -->
                 <exclusion>
                     <groupId>com.azure</groupId>
@@ -114,7 +122,10 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>commons-lang3-api</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>gson-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>okhttp-api</artifactId>
@@ -171,7 +182,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>matrix-auth</artifactId>
-            <version>3.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.scribejava</groupId>
@@ -210,11 +220,6 @@
         </dependency>
 
         <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.jenkins.configuration-as-code</groupId>
             <artifactId>test-harness</artifactId>
@@ -243,8 +248,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2543.vfb_1a_5fb_9496d</version>
+                <artifactId>bom-2.401.x</artifactId>
+                <version>2745.vc7b_fe4c876fa_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

From 9c13a993b9bc37fdebfe20959915c99b5c39e36a Mon Sep 17 00:00:00 2001
From: Stefan Spieker <S.Spieker@gmx.net>
Date: Thu, 4 Apr 2024 17:06:13 +0200
Subject: [PATCH 2/2] use Jenkins 2.414.3 as baseline

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b5b911f..9b067b1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jenkins.version>2.401.3</jenkins.version>
+        <jenkins.version>2.414.3</jenkins.version>
         <node.version>20.12.1</node.version>
         <npm.version>10.5.0</npm.version>
         <hpi.compatibleSinceVersion>391.v252da_e1dd39c</hpi.compatibleSinceVersion>
@@ -248,8 +248,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.401.x</artifactId>
-                <version>2745.vc7b_fe4c876fa_</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2950.va_633b_f42f759</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>