Merge pull request #368 from sghill-rewrite/modernize/jenkins-2.401.3

Modernize to Jenkins 2.401.3
jenkinsci · Dec 5, 2023 · a9203f8 · a9203f8
2 parents 0d8d2c3 + 489bea2
commit a9203f8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
         <revision>1</revision>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-        <jenkins.version>2.387.3</jenkins.version>
+        <jenkins.version>2.401.3</jenkins.version>
         <hpi.compatibleSinceVersion>1.9</hpi.compatibleSinceVersion>
     </properties>
     <artifactId>stashNotifier</artifactId>
@@ -80,8 +80,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2516.v113cb_3d00317</version>
+                <artifactId>bom-2.401.x</artifactId>
+                <version>2612.v3d6a_2128c0ef</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifier.java b/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifier.java
@@ -76,7 +76,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.PrintStream;

diff --git a/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifierDefault.java b/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifierDefault.java
@@ -1,6 +1,6 @@
 package org.jenkinsci.plugins.stashNotifier;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 

diff --git a/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifierModule.java b/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifierModule.java
@@ -7,8 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.List;
 
 @Extension

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/DescriptorImplTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/DescriptorImplTest.java
@@ -137,10 +137,10 @@ public void test_doFillCredentialsIdItems_has_permission() {
         //given
         Item project = mock(Item.class);
         when(project.hasPermission(Item.CONFIGURE)).thenReturn(true);
-        when(CredentialsProvider.listCredentials(
+        when(CredentialsProvider.listCredentialsInItem(
                 any(),
                 any(Item.class),
-                any(Authentication.class),
+                any(org.springframework.security.core.Authentication.class),
                 anyList(),
                 any()
         )).thenReturn(new ListBoxModel());