Merge branch 'master' into master

Author: MarkEWaite

.dependabot/config.yml

@@ -0,0 +1,11 @@
+version: 1
+
+update_configs:
+  - package_manager: "java:maven"
+    directory: "/"
+    update_schedule: "weekly"
+    target_branch: "stable-3.x"
+    default_reviewers:
+      - "MarkEWaite"
+    default_labels:
+      - "no-changelog"

.github/pull_request_template.md

@@ -5,22 +5,23 @@ If it fixes a bug or resolves a feature request, include a link to the issue.
 
 ## Checklist
 
-_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. This is simply a reminder of what we are going to look for before merging your code._
+_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. This is simply a reminder of what we are going to look for before merging your code. If a checkbox or line does not apply to this pull request, delete it. We prefer all checkboxes to be checked before a pull request is merged_
 
 - [ ] I have read the [CONTRIBUTING](https://github.com/jenkinsci/git-plugin/blob/master/CONTRIBUTING.md) doc
 - [ ] I have referenced the Jira issue related to my changes in one or more commit messages
 - [ ] I have added tests that verify my changes
 - [ ] Unit tests pass locally with my changes
 - [ ] I have added documentation as necessary
 - [ ] No Javadoc warnings were introduced with my changes
-- [ ] No findbugs warnings were introduced with my changes
+- [ ] No spotbugs warnings were introduced with my changes
 - [ ] I have interactively tested my changes
 - [ ] Any dependent changes have been merged and published in upstream modules (like git-client-plugin)
 
 ## Types of changes
 
-What types of changes does your code introduce? _Put an `x` in the boxes that apply_
+What types of changes does your code introduce? _Put an `x` in the boxes that apply. Delete the items in the list that do *not* apply_
 
+- [ ] Dependency or infrastructure update
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

.github/release-drafter.yml

@@ -0,0 +1,3 @@
+_extends: .github
+tag-template: git-$NEXT_PATCH_VERSION
+version-template: $MAJOR.$MINOR.$PATCH

CONTRIBUTING.md

@@ -2,7 +2,7 @@ Contributing to the Git Plugin
 ==============================
 
 The git plugin implements the [Jenkins SCM API](https://plugins.jenkins.io/scm-api).
-Refer to the SCM API documentation for [plugin naming conventions]https://github.com/jenkinsci/scm-api-plugin/blob/master/docs/implementation.adoc#naming-your-plugin(),
+Refer to the SCM API documentation for [plugin naming conventions](https://github.com/jenkinsci/scm-api-plugin/blob/master/docs/implementation.adoc#naming-your-plugin),
 and for the [preferred locations of new functionality](https://github.com/jenkinsci/scm-api-plugin/blob/master/CONTRIBUTING.md#add-to-core-or-create-extension-plugin).
 
 Plugin source code is hosted on [GitHub](https://github.com/jenkinsci/git-plugin).
@@ -21,9 +21,9 @@ Code coverage reporting is available as a maven target.
 Please try to improve code coverage with tests when you submit.
 * `mvn -P enable-jacoco clean install jacoco:report` to report code coverage
 
-Please don't introduce new findbugs output.
-* `mvn findbugs:check` to analyze project using [Findbugs](http://findbugs.sourceforge.net/)
-* `mvn findbugs:gui` to review Findbugs report using GUI
+Please don't introduce new spotbugs output.
+* `mvn spotbugs:check` to analyze project using [Spotbugs](https://spotbugs.github.io/)
+* `mvn spotbugs:gui` to review Findbugs report using GUI
 
 Code formatting in the git plugin varies between files.  Try to
 maintain reasonable consistency with the existing files where

Jenkinsfile

@@ -1,10 +1,13 @@
 #!groovy
 
-// Test plugin compatibility to recent Jenkins LTS
+// Test plugin compatibility to recommended configurations
 // Allow failing tests to retry execution
-buildPlugin(configurations: buildPlugin.recommendedConfigurations(),
-            findbugs: [run:true, archive:true, unstableTotalAll: '0'],
-            failFast: false)
+subsetConfiguration = [ [ jdk: '8',  platform: 'windows', jenkins: null                      ],
+                        [ jdk: '8',  platform: 'linux',   jenkins: '2.164.1', javaLevel: '8' ],
+                        [ jdk: '11', platform: 'linux',   jenkins: '2.164.1', javaLevel: '8' ]
+                      ]
+
+buildPlugin(configurations: subsetConfiguration, failFast: false)
 
 def branches = [:]