Merge branches 'jsr305', 'dependabot/maven/org.jenkins-ci.plugins-plugin-4.68' and 'dependabot/maven/org.jenkins-ci.plugins-authentication-tokens-1.53.v1c90fd9191a_b_' into octopus

Author: MarkEWaite

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.55</version>
+    <version>4.68</version>
     <relativePath/>
   </parent>
 
@@ -33,7 +33,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-    <jenkins.version>2.361.4</jenkins.version>
+    <jenkins.version>2.387.3</jenkins.version>
   </properties>
 
   <repositories>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>authentication-tokens</artifactId>
-      <version>1.4</version>
+      <version>1.53.v1c90fd9191a_b_</version>
     </dependency>
     <dependency>
       <groupId>org.jenkinsci.plugins</groupId>
@@ -155,8 +155,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
-        <version>1886.va_11c9f461054</version>
+        <artifactId>bom-2.387.x</artifactId>
+        <version>2163.v2d916d90c305</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerServerCredentialsTest.java

@@ -31,8 +31,8 @@
 import com.cloudbees.plugins.credentials.common.IdCredentials;
 import com.cloudbees.plugins.credentials.domains.Domain;
 import com.cloudbees.plugins.credentials.domains.DomainSpecification;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
 import hudson.security.ACL;
 import hudson.util.Secret;
 import org.junit.Rule;