Merge branch 'master' into addJsonUsernameAndPassword

Author: chriskilding

.gitignore

@@ -21,6 +21,11 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+# Eclipse IDE files
+.classpath
+.project
+.settings
+
 # Others
 
 .DS_Store

docs/README.md

@@ -419,6 +419,12 @@ unclassified:
 
 ## Development
 
+### Git
+
+Start by cloning the project.
+
+**Note for Windows users:** some of the file paths in this project may exceed the legacy Win32 path length limit. This may cause an error when cloning the project on Windows. If you see this error, enable Git's Windows longpaths support with `git config --system core.longpaths true` (you might need to run Git as Administrator for this to work). Then try to clone the project again.
+
 ### Dependencies
 
 - Docker

pom.xml

@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.289.x</artifactId>
-                <version>1085.vc4c268262299</version>
+                <version>1461.vb_3c6de28f2b_a_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.16.2</version>
+            <version>1.17.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/io/jenkins/plugins/credentials/secretsmanager/AwsCredentialsProvider.java

@@ -61,7 +61,7 @@ public <C extends Credentials> List<C> getCredentials(@Nonnull Class<C> type,
 
     @Override
     public CredentialsStore getStore(ModelObject object) {
-        return object == Jenkins.getInstance() ? store : null;
+        return object == Jenkins.get() ? store : null;
     }
 
     @Override

src/main/java/io/jenkins/plugins/credentials/secretsmanager/AwsCredentialsStore.java

@@ -37,23 +37,23 @@ public AwsCredentialsStore(AwsCredentialsProvider provider) {
     @Nonnull
     @Override
     public ModelObject getContext() {
-        return Jenkins.getInstance();
+        return Jenkins.get();
     }
 
     @Override
     public boolean hasPermission(@NonNull Authentication authentication,
                                  @NonNull Permission permission) {
         return CredentialsProvider.VIEW.equals(permission)
-                && Jenkins.getInstance().getACL().hasPermission(authentication, permission);
+                && Jenkins.get().getACL().hasPermission(authentication, permission);
     }
 
     @Nonnull
     @Override
     public List<Credentials> getCredentials(@NonNull Domain domain) {
         // Only the global domain is supported
         if (Domain.global().equals(domain)
-                && Jenkins.getInstance().hasPermission(CredentialsProvider.VIEW)) {
-            return provider.getCredentials(Credentials.class, Jenkins.getInstance(), ACL.SYSTEM);
+                && Jenkins.get().hasPermission(CredentialsProvider.VIEW)) {
+            return provider.getCredentials(Credentials.class, Jenkins.get(), ACL.SYSTEM);
         } else {
             return Collections.emptyList();
         }

src/main/java/io/jenkins/plugins/credentials/secretsmanager/config/credentialsProvider/CredentialsProvider.java

@@ -16,16 +16,11 @@ public abstract class CredentialsProvider extends AbstractDescribableImpl<Creden
     public abstract AWSCredentialsProvider build();
 
     public abstract static class DescriptorImpl extends Descriptor<CredentialsProvider> {
-        /**
-         * {@inheritDoc}
-         */
+
         protected DescriptorImpl() {
             super();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         protected DescriptorImpl(Class<? extends CredentialsProvider> clazz) {
             super(clazz);
         }

src/main/java/io/jenkins/plugins/credentials/secretsmanager/config/transformer/description/DescriptionTransformer.java

@@ -18,16 +18,11 @@ public abstract class DescriptionTransformer extends AbstractDescribableImpl<Des
     public abstract String transform(String str);
 
     public abstract static class DescriptorImpl extends Descriptor<DescriptionTransformer> {
-        /**
-         * {@inheritDoc}
-         */
+
         protected DescriptorImpl() {
             super();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         protected DescriptorImpl(Class<? extends DescriptionTransformer> clazz) {
             super(clazz);
         }

src/main/java/io/jenkins/plugins/credentials/secretsmanager/config/transformer/name/NameTransformer.java

@@ -18,16 +18,11 @@ public abstract class NameTransformer extends AbstractDescribableImpl<NameTransf
     public abstract String transform(String str);
 
     public abstract static class DescriptorImpl extends Descriptor<NameTransformer> {
-        /**
-         * {@inheritDoc}
-         */
+
         protected DescriptorImpl() {
             super();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         protected DescriptorImpl(Class<? extends NameTransformer> clazz) {
             super(clazz);
         }

src/test/java/io/jenkins/plugins/credentials/secretsmanager/util/assertions/WorkflowRunAssert.java

@@ -1,7 +1,6 @@
 package io.jenkins.plugins.credentials.secretsmanager.util.assertions;
 
 import org.assertj.core.api.AbstractAssert;
-import org.jenkinsci.plugins.plaincredentials.FileCredentials;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import hudson.model.Result;