Merge remote-tracking branch 'origin/github/rinrinne/master' into stable-2.10

* origin/github/rinrinne/master:
  Prepare for next...?
  Release 3.14
  Update README
  Prelease for next development iteration
  Release 3.1
  Fix README
  Prepare for next development iteration
  Release 3.0
  Update README
  Bump amqp-client to 3.5.0
  Update README and Documentation

Change-Id: I542c745a5c1aa24d39dff31def50b8b56def611a

README.md

diff --git a/README.md b/README.md
index 190c45c..8e71ef5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 This can publish gerrit events to message queue provided by RabbitMQ.
 Published events are the same as Gerrit stream evnets.
 
-This plugin works on Gerrit 2.8 or later.
+This plugin works on Gerrit 2.8 - 2.10.
 
 Environments
 ---------------------
@@ -34,7 +34,7 @@
 Using another version API
 --------------------------
 
-Now avaliable for Gerrit 2.8.5 only. If you want to use it on another version of Gerrit, please try the below.
+Now avaliable for Gerrit 2.10 only. If you want to use it on another version of Gerrit, please try the below.
 
     ./gradlew build -PapiVersion=2.8
 
@@ -65,6 +65,31 @@
 History
 ---------------------
 
+* 3.14 (Freezed)
+  * New branch: `stable-2.10`
+  * HEAD in `master` is permanently latest but would not be updated by author anymore.
+
+* 3.1
+  * Fix README
+
+* 3.0
+  * New feature: multi url support
+  * Bump amqp-client to 3.5.0
+  * Bump Gradle shadow plugin to 1.2.1
+  * Add Gradle release plugin 2.0.2
+  * Fix & improve connection handling
+
+* 2.0
+  * The feature that configure queue/exchange/bind has been removed.
+    Means messages are published to existing exhange only.
+  * Allow event filter based on an existing user (Thanks @GLundh!)
+  * Fix singletonize Properties class and fix typo (Thanks @hugares!)
+  * Add API support: 2.9-2.10
+  * Bumped default Gerrit API to 2.10
+  * Bumped amqp-client to 3.4.4
+  * Bumped Gradle to 2.3
+  * Remove Buck support
+
 * 1.4
   * Binary release
   * Add gradle support

build.gradle

diff --git a/build.gradle b/build.gradle
index f8b83bf..f4eb96d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@
 targetCompatibility = 1.7
 
 group = 'com.googlesource.gerrit.plugins.rabbitmq'
-version = '2.1-SNAPSHOT'
+version = '3.141-SNAPSHOT'
 
 jar {
   manifest {
@@ -71,7 +71,7 @@
     [group: 'commons-lang', name: 'commons-lang', version: '2.5'],
     [group: 'commons-codec', name: 'commons-codec', version: '1.4'],
     [group: 'commons-io', name: 'commons-io', version: '1.4'],
-    [group: 'com.rabbitmq', name: 'amqp-client', version: '3.4.4'],
+    [group: 'com.rabbitmq', name: 'amqp-client', version: '3.5.0'],
   )
 }
 

src/main/resources/Documentation/config.md

diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 4c75377..cda6fb5 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -1,7 +1,20 @@
 RabbitMQ Configuration
 ======================
 
-Some parameters can be configured in the plugin config file `rabbitmq.config`.
+Some parameters can be configured using config file.
+
+Directory
+---------------------
+
+You can locate config files to `$site_path/data/rabbitmq/site`.
+File extension must be `.config`.
+Connection to RabbitMQ will be established for each files.
+
+If `rabbitmq.config` exists in `$site_path/data/rabbitmq`, it is loaded at first.
+It means that this is default for all config files.
+
+File format
+---------------------
 
 ```
   [amqp]
@@ -79,7 +92,7 @@
 Default Values
 -----------------
 
-You can change the below values by specifying them in `rabbitmq.config`.
+You can change the below values by specifying them in config file.
 
 **Bold** is String value.