diff --git a/pom.xml b/pom.xml index 0ea87dc..4571c24 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 1 999999-SNAPSHOT - 2.387.3 + 2.401.3 1.9 stashNotifier @@ -80,8 +80,8 @@ io.jenkins.tools.bom - bom-2.387.x - 2516.v113cb_3d00317 + bom-2.401.x + 2612.v3d6a_2128c0ef import pom diff --git a/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifier.java b/src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifier.java index 76495e8..d91c3a9 100644 --- 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 index 8505607..7af3b22 100644 --- 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 index ee7b6f9..6c269fb 100644 --- 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 index 2758b5e..a427059 100644 --- 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());