List merges in changelog

.gitignore

@@ -5,6 +5,7 @@
 
 target/
 work/
+.@tmp/
 
 .project
 .classpath
@@ -21,4 +22,7 @@ tags
 
 # emacs backup files
 *~
-/nbproject/
+/nbproject/
+
+# Mac OSX
+.DS_Store

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.0-beta-7</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

CONTRIBUTING.md

@@ -8,7 +8,7 @@ or can be submitted directly if you have commit permission to the
 git-client-plugin repository.
 
 Pull requests are evaluated by the
-[Cloudbees Jenkins job](https://jenkins.ci.cloudbees.com/job/plugins/job/git-client-plugin/).
+[ci.jenkins.io Jenkins job](https://ci.jenkins.io/job/Plugins/job/git-client-plugin/).
 You should receive e-mail with the results of the evaluation.
 
 Before submitting your change, please assure that you've added tests
@@ -27,10 +27,12 @@ assure that you haven't introduced new findbugs warnings.
 
 # Code Style Guidelines
 
-## Indentation
+Use the [Jenkins SCM API coding style guide](https://github.com/jenkinsci/scm-api-plugin/blob/master/CONTRIBUTING.md#code-style-guidelines) for new code.
 
-* Code formatting in the git client plugin varies between files.  Recent additions have generally used the Netbeans "Format" right-click action to maintain consistency.  Try to maintain reasonable consistency with the existing files.
-* Please don't perform wholesale reformatting of a file without discussing with the current maintainers.
+## Indentation and White Space
+
+* Code formatting in the git client plugin varies between files.  Recent additions have generally used the Netbeans "Format" right-click action to maintain consistency.  Try to maintain reasonable consistency with the existing files
+* Please don't reformat a file without discussing with the current maintainers
 
 ## Maven POM file layout
 

Jenkinsfile

@@ -1,9 +1,6 @@
 #!groovy
 
 // build both versions, retry test failures
-buildPlugin(jenkinsVersions: [null, '2.60.3'],
+buildPlugin(jenkinsVersions: [null, '2.121.3'],
             findbugs: [run:true, archive:true, unstableTotalAll: '0'],
             failFast: false)
-
-// No plugin compatibility tests, retry test failures
-// buildPlugin(failFast: false)

README.md

@@ -1,31 +1,41 @@
 Utility plugin for Git-related support
 ======================================
 
-Extracted from [git-plugin](https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin)
+Extracted from [git-plugin](https://plugins.jenkins.io/git)
 to make it easier for other plugins to use and contribute new features.
 Includes JGit as a library so that other Jenkins components can rely on
 JGit whenever the git client plugin is available.
 
-* see [Jenkins wiki](https://wiki.jenkins-ci.org/display/JENKINS/Git+Client+Plugin) for feature descriptions
+* see [Jenkins plugins site](https://plugins.jenkins.io/git-client) for feature descriptions
 * use [JIRA](https://issues.jenkins-ci.org) to report issues / feature requests
 
 Contributing to the Plugin
 ==========================
 
-Refer to [contributing to the plugin](https://github.com/jenkinsci/git-client-plugin/blob/master/CONTRIBUTING.md)
+Refer to [contributing to the plugin](CONTRIBUTING.md)
 for suggestions to speed the acceptance of your contributions.
 
+Code coverage reporting is available as a maven target and is actively
+monitored.  Please improve code coverage with the tests you submit.
+Code coverage reporting is written to `target/site/jacoco/` by the maven command:
+
+```
+  $ mvn -P enable-jacoco clean install jacoco:report
+```
+
 Building the Plugin
 ===================
 
+```
   $ java -version # Requires Java 1.8
-  $ mvn -version # Requires a modern maven version; maven 3.2.5 and 3.5.0 are known to work
+  $ mvn -version # Requires Apache Maven 3.5.0 or later
   $ mvn clean install
+```
 
 To Do
 =====
 
 * Evaluate [pull requests](https://github.com/jenkinsci/git-client-plugin/pulls)
 * Fix [bugs](https://issues.jenkins-ci.org/secure/IssueNavigator.jspa?mode=hide&reset=true&jqlQuery=project+%3D+JENKINS+AND+status+in+%28Open%2C+"In+Progress"%2C+Reopened%29+AND+component+%3D+git-client-plugin)
 * Create infrastructure to detect [files opened during a unit test](https://issues.jenkins-ci.org/browse/JENKINS-19994) and left open at exit from test
-* Complete more of the JGit implementation
+* Complete more JGit implementation