Merge remote-tracking branch 'upstream/master' into JENKINS-69731-scm-BRANCH_NAME

Author: jimklimov

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jenkinsci/pipeline-groovy-lib-plugin-developers

.github/release-drafter.yml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.6</version>
   </extension>
 </extensions>

.mvn/extensions.xml

@@ -1,5 +1,6 @@
-buildPlugin(useContainerAgent: true, configurations: [
-  [ platform: "linux", jdk: "8" ],
-  [ platform: "windows", jdk: "8" ],
-  [ platform: "linux", jdk: "11" ]
+buildPlugin(
+  useContainerAgent: true,
+  configurations: [
+    [platform: 'linux', jdk: 17],
+    [platform: 'windows', jdk: 11],
 ])

Jenkinsfile

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.50</version>
+        <version>4.54</version>
         <relativePath/>
     </parent>
     <groupId>io.jenkins.plugins</groupId>
@@ -63,15 +63,15 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.346.3</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.346.x</artifactId>
-                <version>1678.vc1feb_6a_3c0f1</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>1750.v0071fa_4c4a_e3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -200,7 +200,7 @@
         <dependency>
             <groupId>org.tmatesoft.svnkit</groupId>
             <artifactId>svnkit-cli</artifactId>
-            <version>1.10.7</version>
+            <version>1.10.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

pom.xml

@@ -172,7 +172,6 @@ private static <T> T retrySCMOperation(TaskListener listener, Callable<T> task)
         return ret;
     }
 
-    @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE", justification = "apparently bogus complaint about redundant nullcheck in try-with-resources")
     static void doRetrieve(String name, boolean changelog, @NonNull SCM scm, String libraryPath, FilePath target, Run<?, ?> run, TaskListener listener) throws Exception {
         // Adapted from CpsScmFlowDefinition:
         SCMStep delegate = new GenericSCMStep(scm);

src/main/java/org/jenkinsci/plugins/workflow/libs/SCMSourceRetriever.java

@@ -32,6 +32,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
 import com.google.common.collect.ImmutableMap;
+import hudson.Functions;
 import hudson.model.Item;
 import hudson.model.Result;
 import hudson.plugins.git.GitSCM;
@@ -54,6 +55,7 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.jvnet.hudson.test.BuildWatcher;
@@ -188,6 +190,7 @@ public class FolderLibrariesTest {
 
     @Issue("JENKINS-43019")
     @Test public void classCastException() throws Exception {
+        assumeFalse("Too slow, prone to timing out before getting to build #51", Functions.isWindows());
         sampleRepo1.init();
         sampleRepo1.write("src/pkg/Obj.groovy", "package pkg; public class Obj implements Serializable {public Obj() {}}");
         sampleRepo1.write("vars/objs.groovy", "@groovy.transform.Field final pkg.Obj OBJ = new pkg.Obj()");

src/test/java/org/jenkinsci/plugins/workflow/libs/FolderLibrariesTest.java

@@ -85,7 +85,11 @@ public class LibraryStepTest {
             null, null, Collections.<GitSCMExtension>emptyList())));
         s.setChangelog(false);
         r.assertEqualDataBoundBeans(s, stepTester.configRoundTrip(s));
-        snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM([$class: 'GitSCM', branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]])");
+        if (r.jenkins.get().getPlugin("git").getWrapper().getVersion().startsWith("4.")) {
+            snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM([$class: 'GitSCM', branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]])");
+        } else {
+            snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM(scmGit(branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]))");
+        }
     }
 
     @Test public void vars() throws Exception {