Merge branch 'master' into test-jgit-7.2

Author: MarkEWaite

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.9</version>
+    <version>5.10</version>
     <relativePath />
   </parent>
 
@@ -41,7 +41,7 @@
     <no-test-jar>false</no-test-jar>
     <!-- Jenkins.MANAGE is still in Beta -->
     <useBeta>true</useBeta>
-    <!-- Do not run extra reporting for checkstyle or pmd -->
+    <!-- Do not run extra reporting for pmd -->
     <!-- https://stackoverflow.com/questions/12038238/unable-to-locate-source-xref-to-link-to -->
     <linkXRef>false</linkXRef>
     <spotbugs.effort>Max</spotbugs.effort>
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>4440.v39a_9eb_b_c6b_4d</version>
+        <version>4607.v67a_4791074d7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -150,7 +150,7 @@
     <dependency>
       <groupId>nl.jqno.equalsverifier</groupId>
       <artifactId>equalsverifier</artifactId>
-      <version>3.19.2</version>
+      <version>3.19.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -258,18 +258,4 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.6.0</version>
-        <configuration>
-          <configLocation>google_checks.xml</configLocation>
-          <failOnViolation>true</failOnViolation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>

src/main/resources/hudson/plugins/git/GitSCM/help.html

@@ -125,7 +125,7 @@
 <pre>
 checkout poll: false,
          scmGit(userRemoteConfigs: [
-                    [ url: 'git://git.kernel.org/pub/scm/git/git.git ]
+                    [ url: 'git://git.kernel.org/pub/scm/git/git.git' ]
                 ])
 </pre>
     </p>

src/main/resources/hudson/plugins/git/extensions/impl/DisableRemotePoll/help.html

@@ -1,6 +1,5 @@
 <div>
        Git plugin uses git ls-remote polling mechanism by default when configured with a single branch (no wildcards!).
-       This compare the latest built commit SHA with the remote branch without cloning a local copy of the repo.<br><br>
-       If you don't want to / can't use this.<br><br>
+       This compares the most recently built commit SHA with the remote branch without cloning a local copy of the repo.<br><br>
        If this option is selected, polling will require a workspace and might trigger unwanted builds (see <a href="https://issues.jenkins.io/browse/JENKINS-10131" target="_blank" rel="noopener noreferrer">JENKINS-10131</a>).
 </div>

src/main/resources/jenkins/plugins/git/GitStep/help.html

@@ -1,10 +1,10 @@
 <div>
     <p>
-    Git step. It performs a clone from the specified repository.
+    The <code>git</code> step performs a clone from the specified repository into a Pipeline workspace.
     </p>
     <p>
     Use the <a href="https://www.jenkins.io/redirect/pipeline-snippet-generator">Pipeline Syntax Snippet Generator</a> to generate a sample pipeline script for the git step.
-    More advanced checkout operations require the <code>checkout</code> step rather than the <code>git</code> step.
+    More advanced checkout operations require the <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a> rather than the <code>git</code> step.
     Examples of the <code>git</code> step include:
     <ul>
       <li><a href="#git-step-with-defaults">Git step with defaults</a></li>
@@ -17,7 +17,7 @@
     </p>
 
     <p>
-    The <code>git</code> step is a simplified shorthand for a subset of the more powerful <code>checkout</code> step:
+    The <code>git</code> step is a simplified shorthand for a subset of the more powerful <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a>:
 <pre>
 checkout scmGit(branches: [[name: 'main']],
     userRemoteConfigs: [[url: 'https://git-server/user/repository.git']])
@@ -27,14 +27,14 @@
     <hr>
 
     <p>
-    <strong>NOTE:</strong> The <code>checkout</code> step is the <strong>preferred SCM checkout method</strong>.
+    <strong>NOTE:</strong> The <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a> is the <strong>preferred SCM checkout method</strong>.
     It provides significantly more functionality than the <code>git</code> step.
     </p>
     <p>Use the <a href="https://www.jenkins.io/redirect/pipeline-snippet-generator">Pipeline Syntax Snippet Generator</a> to generate a sample pipeline script for the checkout step.
     </p>
     <p>
-    The <code>checkout</code> step can be used in many cases where the <code>git</code> step cannot be used.
-    Refer to the <a href="https://plugins.jenkins.io/git/#plugin-content-extensions">git plugin documentation</a> for detailed descriptions of options available to the checkout step.
+    The <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a> can be used in many cases where the <code>git</code> step cannot be used.
+    Refer to the <a href="https://plugins.jenkins.io/git/#plugin-content-extensions">git plugin documentation</a> for detailed descriptions of options available to the <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a>.
     For example, the <code>git</code> step does <strong>not</strong> support:
     <ul>
       <li>SHA-1 checkout</li>
@@ -59,13 +59,13 @@
     Checkout from the git plugin source repository using https protocol, no credentials, and the master branch.
     </p><p>The <a href="https://www.jenkins.io/redirect/pipeline-snippet-generator">Pipeline Syntax Snippet Generator</a> generates this example:
 <pre>
-git 'https://github.com/jenkinsci/git-plugin'
+git 'https://github.com/jenkinsci/git-plugin.git'
 </pre>
     </p>
 
     <strong><a id="git-step-with-https-and-branch">Example: Git step with https and a specific branch</a></strong>
     <p>
-    Checkout from the Jenkins source repository using https protocol, no credentials, and a specific branch (stable-2.204).
+    Checkout from the Jenkins source repository using https protocol, no credentials, and a specific branch (stable-2.492).
     Note that this must be a local branch name like 'master' or 'develop'.
     </p>
     <p>
@@ -76,11 +76,11 @@
       <li>Tag names are <strong>not supported</strong> as the branch argument</li>
     </ul>
     <p>
-    Remote branch names, SHA-1 hashes, and tag names <strong>are supported</strong> by the general purpose <code>checkout</code> step.
+    Remote branch names, SHA-1 hashes, and tag names <strong>are supported</strong> by the general purpose <a href="https://www.jenkins.io/doc/pipeline/steps/params/scmgit/"><code>checkout</code> step</a>.
     </p>
     <p>The <a href="https://www.jenkins.io/redirect/pipeline-snippet-generator">Pipeline Syntax Snippet Generator</a> generates this example:
 <pre>
-git branch: 'stable-2.204',
+git branch: 'stable-2.492',
     url: 'https://github.com/jenkinsci/jenkins.git'
 </pre>
     </p>