Merge branch 'stable-3.x'

Author: MarkEWaite

pom.xml

@@ -32,7 +32,7 @@
     <useBeta>true</useBeta>
     <concurrency>1C</concurrency>
     <scm-api-plugin.version>2.6.3</scm-api-plugin.version>
-    <jcasc.version>1.25</jcasc.version>
+    <jcasc.version>1.27</jcasc.version>
     <maven.checkstyle.plugin.version>3.1.0</maven.checkstyle.plugin.version>
     <maven.checkstyle.version>8.23</maven.checkstyle.version>
   </properties>

src/test/java/hudson/plugins/git/BranchSpecTest.java

@@ -158,6 +158,7 @@ public void testUsesJavaPatternDirectlyIfPrefixedWithColon() {
     }
 
     @Test
+    @Issue("JENKINS-26842")
     public void testUsesJavaPatternWithRepetition() {
     	// match pattern from JENKINS-26842
     	BranchSpec m = new BranchSpec(":origin/release-\\d{8}");

src/test/java/hudson/plugins/git/GitSCMTest.java

@@ -2182,6 +2182,7 @@ public void testInitSparseCheckoutOverSlave() throws Exception {
 
     @Issue("JENKINS-22009")
     @Test
+    @Issue("JENKINS-22009")
     public void testPolling_environmentValueInBranchSpec() throws Exception {
         // create parameterized project with environment value in branch specification
         FreeStyleProject project = createFreeStyleProject();

src/test/java/hudson/plugins/git/UserMergeOptionsTest.java

@@ -204,7 +204,7 @@ public void equalsContract() {
                 .verify();
     }
 
-    @Issue("JENKINS-51638")
+    @Issue({"JENKINS-51638", "JENKINS-34070"})
     @Test
     public void mergeStrategyCase() throws Exception {
         Map<String, Object> args = new HashMap<>();

src/test/java/jenkins/plugins/git/GitJCasCCompatibilityTest.java

@@ -35,6 +35,6 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule restartableJenk
 
     @Override
     protected String stringInLogExpected() {
-        return "Setting class hudson.plugins.git.GitSCM.submoduleCfg = [{}, {}]";
+        return "Setting class hudson.plugins.git.SubmoduleConfig. branches = [mybranch-3, mybranch-4]";
     }
 }

src/test/java/jenkins/plugins/git/ModernScmTest.java

@@ -28,6 +28,7 @@
 import org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 import static org.hamcrest.Matchers.contains;
@@ -40,6 +41,7 @@ public class ModernScmTest {
     public JenkinsRule jenkins = new JenkinsRule();
 
     @Test
+    @Issue("JENKINS-58964")
     public void gitIsModernScm() {
         SCMSourceRetriever.DescriptorImpl descriptor = ExtensionList.lookupSingleton(SCMSourceRetriever.DescriptorImpl.class);
         assertThat(descriptor.getSCMDescriptors(), contains(instanceOf(GitSCMSource.DescriptorImpl.class)));