Merge branch 'master' of https://github.com/jenkinsci/jira-plugin

README.md

@@ -1,13 +1,10 @@
 Jenkins JIRA Plugin
 ===================
 
-[![Join the chat at https://gitter.im/jenkinsci/jira-plugin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jenkinsci/jira-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [![Build Status](https://jenkins.ci.cloudbees.com/buildStatus/icon?job=plugins/jira-plugin)](https://jenkins.ci.cloudbees.com/job/plugins/job/jira-plugin/)
 [![Build Status](https://travis-ci.org/jenkinsci/jira-plugin.svg?branch=master)](https://travis-ci.org/jenkinsci/jira-plugin)
 [![Coverage Status](https://coveralls.io/repos/jenkinsci/jira-plugin/badge.svg?branch=master&service=github)](https://coveralls.io/github/jenkinsci/jira-plugin?branch=master)
 
-
 See [Wiki page](https://wiki.jenkins-ci.org/display/JENKINS/JIRA+Plugin) for more information.
 
 Reported Issues:
@@ -24,30 +21,39 @@ Reported Issues:
 [[by Votes]](https://issues.jenkins-ci.org/issues/?filter=15156)
 [[by Priority]](https://issues.jenkins-ci.org/issues/?filter=15157)
 
+### Building plugin with Docker
+
+Build the plugin locally using Docker and Maven image version 3.3 & newest JDK 8:
+
+    docker run -it --rm -v "$PWD":/usr/src/mymaven -v "$HOME/.m2:/usr/src/mymaven/.m2" -w /usr/src/mymaven maven:3.3-jdk-8 mvn clean package
+
+### Contributing to the Plugin
+
+See [examples](examples/) directory for some useful scripts like:
+
+* [docker_build.sh](examples/docker_build.sh) for building using Docker maven image
+* [docker-compose.yaml](examples/docker-compose.yaml) for running a complete development 
+
+New feature proposals and bug fix proposals should be submitted as [GitHub pull requests](https://help.github.com/articles/creating-a-pull-request).
+
+There are two active branches:
 
+* master - bugfixes and development of new features - major x.Y versions are released from this branch
+* hotfix - bugfix branch - selected commits are cherry picked from master branch - patch x.y.Z are released from this branch
 
-Contributing to the Plugin
-==========================
+Fork the repository on GitHub, prepare your change on your forked copy, and submit a pull request (see [here](https://github.com/jenkinsci/jira-plugin/pulls) for open pull requests). 
 
-Plugin source code is hosted on [GitHub](https://github.com/jenkinsci/jira-plugin).
-New feature proposals and bug fix proposals should be submitted as
-[GitHub pull requests](https://help.github.com/articles/creating-a-pull-request).
-Fork the repository on GitHub, prepare your change on your forked
-copy, and submit a pull request (see [here](https://github.com/jenkinsci/jira-plugin/pulls) for open pull requests). Your pull request will be evaluated by the [Cloudbees Jenkins job](https://jenkins.ci.cloudbees.com/job/plugins/job/jira-plugin/)
-and you should receive e-mail with the results of the evaluation.
+Your pull request will be evaluated by the [Travis CI Job](https://travis-ci.org/jenkinsci/jira-plugin)  and you should receive e-mail with the results of the evaluation.
 
 If you are adding new features please make sure that they support Jenkins Pipeline Plugin.
 See (here](https://github.com/jenkinsci/pipeline-plugin/blob/master/COMPATIBILITY.md) for some information.
 
 Before submitting your change make sure that:
 * you added tests - the coverage will be checked after submitting PRs
 * the code formatting follows the plugin standard (i.e. how most of the source code is formatted)
-* imports are organised
+* imports are organised - please do not use wildcard imports
 * you use findbugs to see if you haven't introduced any new warnings.
 
-There have been many developers involved
-in the git plugin and there are many, many users who depend on the
-git-plugin.  Tests help us assure that we're delivering a reliable
-plugin, and that we've communicated our intent to other developers in
-a way that they can detect when they run tests.
+There have been many developers involved in the git plugin and there are many, many users who depend on the git-plugin.  
+Tests help us assure that we're delivering a reliable plugin, and that we've communicated our intent to other developers in a way that they can detect when they run tests.
 

examples/docker_build.sh

@@ -0,0 +1,2 @@
+MAVEN_VERSION=3.3-jdk-8
+docker run -it --rm -v "$PWD":/usr/src/mymaven -v "$HOME/.m2:/usr/src/mymaven/.m2" -w /usr/src/mymaven maven:${MAVEN_VERSION} mvn clean package

src/main/java/hudson/plugins/jira/JiraChangeLogAnnotator.java

@@ -104,7 +104,7 @@ public void annotate(Run<?, ?> build, Entry change, MarkupText text) {
                             issuesToBeSaved.add(issue);
                         }
                     } catch (Exception e) {
-                        LOGGER.log(Level.WARNING, "Error getting remote issue " + id, e);
+                        LOGGER.log(Level.FINE, "Error getting remote issue " + id, e);
                     }
                 }
 

src/main/resources/hudson/plugins/jira/JiraVersionCreatorBuilder/config.jelly

@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+  <f:entry title="${%Jira Version}" field="jiraVersion">
+        <f:textbox/>
+  </f:entry>
+  <f:entry title="${%Jira Project Key}" field="jiraProjectKey">
+        <f:textbox/>
+  </f:entry>
+</j:jelly>

src/main/resources/hudson/plugins/jira/JiraVersionCreatorBuilder/help-jiraProjectKey.html

@@ -0,0 +1,4 @@
+<div>
+<p>Specify the project key. A project key is the all capitals part before the issue number in JIRA.</p>
+<p>(<strong>EXAMPLE</strong>-100)</p>
+</div>

src/main/resources/hudson/plugins/jira/JiraVersionCreatorBuilder/help-jiraVersion.html

@@ -0,0 +1,3 @@
+<div>
+Specify the name of the parameter which will contain the release version. This can reference a build parameter.
+</div>