diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..1f3636409
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.7</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000..2a0299c48
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/Jenkinsfile b/Jenkinsfile
index 1bc4eb37a..cc871a9f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,5 @@
 // Builds a module using https://github.com/jenkins-infra/pipeline-library
 buildPlugin(useContainerAgent: true, configurations: [
-    [platform: 'linux', jdk: 11], 
-    [platform: 'windows', jdk: 11],
-    [platform: 'linux', jdk: 17]
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
 ])
diff --git a/pom.xml b/pom.xml
index 256e4bd9e..bad4264fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
@@ -5,25 +6,31 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.52</version>
+    <version>4.79</version>
+    <relativePath />
   </parent>
 
   <artifactId>p4</artifactId>
-  <version>1.15.2-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
   <packaging>hpi</packaging>
   <name>P4 Plugin</name>
   <description>Perforce Client plugin for the Jenkins SCM provider.</description>
-  <url>https://github.com/jenkinsci/p4-plugin</url>
+  <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
   <properties>
-    <jenkins.version>2.361.4</jenkins.version>
+    <revision>1.15.2</revision>
+    <changelist>-SNAPSHOT</changelist>
+    <jenkins.version>2.414.3</jenkins.version>
+    <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+    <!-- TODO fix SpotBugs violations -->
+    <spotbugs.threshold>High</spotbugs.threshold>
   </properties>
 
   <scm>
-    <connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>p4-1.15.0</tag>
+    <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
 
   <developers>
@@ -57,8 +64,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
-        <version>2102.v854b_fec19c92</version>
+        <artifactId>bom-2.414.x</artifactId>
+        <version>2884.vc36b_64ce114a_</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -71,42 +78,70 @@
       <groupId>com.perforce</groupId>
       <artifactId>p4java</artifactId>
       <version>2023.2.2553500</version>
+      <exclusions>
+        <!-- Provided by Jenkins core -->
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+        <!-- Provided by commons-lang3-api plugin -->
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-exec</artifactId>
       <version>1.3</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.9.0</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>gson-api</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.mashape.unirest</groupId>
       <artifactId>unirest-java</artifactId>
       <version>1.4.9</version>
+      <exclusions>
+        <!-- Provided by apache-httpcomponents-client-4-api plugin -->
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpasyncclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpmime</artifactId>
+        </exclusion>
+        <!-- Provided by json-api plugin -->
+        <exclusion>
+          <groupId>org.json</groupId>
+          <artifactId>json</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.13</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.5.13</version>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>apache-httpcomponents-client-4-api</artifactId>
     </dependency>
 
     <!-- Jenkins dependencies -->
@@ -129,7 +164,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
-      <version>324.va_f5d6774f3a_d</version>
     </dependency>
 
     <dependency>
@@ -169,7 +203,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>multiple-scms</artifactId>
-      <version>0.6</version>
+      <version>0.8</version>
       <optional>true</optional>
     </dependency>
 
@@ -219,9 +253,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20231013</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>json-api</artifactId>
     </dependency>
 
   </dependencies>
diff --git a/src/main/java/org/jenkinsci/plugins/p4/credentials/P4CredentialsImpl.java b/src/main/java/org/jenkinsci/plugins/p4/credentials/P4CredentialsImpl.java
index 0ce8d2ff9..37c17cc6d 100644
--- a/src/main/java/org/jenkinsci/plugins/p4/credentials/P4CredentialsImpl.java
+++ b/src/main/java/org/jenkinsci/plugins/p4/credentials/P4CredentialsImpl.java
@@ -35,7 +35,7 @@ static public ListBoxModel doFillCredentialItems() {
 				acl, domain);
 
 		if (credentials.isEmpty()) {
-			list.add("Select credential...", null);
+			list.add("Select credential...", "");
 		}
 		for (P4BaseCredentials c : credentials) {
 			StringBuffer sb = new StringBuffer();
diff --git a/src/test/java/org/jenkinsci/plugins/p4/client/FreeStyleTest.java b/src/test/java/org/jenkinsci/plugins/p4/client/FreeStyleTest.java
index dd54ada48..6f748aa72 100644
--- a/src/test/java/org/jenkinsci/plugins/p4/client/FreeStyleTest.java
+++ b/src/test/java/org/jenkinsci/plugins/p4/client/FreeStyleTest.java
@@ -1,8 +1,8 @@
 package org.jenkinsci.plugins.p4.client;
 
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
 import com.perforce.p4java.option.server.CounterOptions;
 import com.perforce.p4java.server.IOptionsServer;
 import hudson.model.Action;
diff --git a/src/test/java/org/jenkinsci/plugins/p4/review/ReviewImplTest.java b/src/test/java/org/jenkinsci/plugins/p4/review/ReviewImplTest.java
index 286ec2fb7..d92a09ff2 100644
--- a/src/test/java/org/jenkinsci/plugins/p4/review/ReviewImplTest.java
+++ b/src/test/java/org/jenkinsci/plugins/p4/review/ReviewImplTest.java
@@ -1,7 +1,7 @@
 package org.jenkinsci.plugins.p4.review;
 
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlPage;
 import hudson.model.Action;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParameterValue;
diff --git a/src/test/java/org/jenkinsci/plugins/p4/scm/PerforceSCMSourceTest.java b/src/test/java/org/jenkinsci/plugins/p4/scm/PerforceSCMSourceTest.java
index 316c4fc67..2debec5c2 100644
--- a/src/test/java/org/jenkinsci/plugins/p4/scm/PerforceSCMSourceTest.java
+++ b/src/test/java/org/jenkinsci/plugins/p4/scm/PerforceSCMSourceTest.java
@@ -6,7 +6,7 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.CredentialsStore;
 import com.cloudbees.plugins.credentials.domains.Domain;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPage;
 import com.perforce.p4java.core.IStream;
 import com.perforce.p4java.core.IStreamSummary;
 import com.perforce.p4java.core.IStreamViewMapping;