From c11e37bde94848823d70f60432105077781ae486 Mon Sep 17 00:00:00 2001
From: Costin Leau <costin.leau@gmail.com>
Date: Tue, 2 Feb 2016 16:19:28 +0200
Subject: [PATCH] 2.2.0 release

---
 README.md                                        | 16 +++-------------
 docs/src/reference/asciidoc/index.adoc           |  6 +++---
 gradle.properties                                |  6 +++---
 repository-hdfs/README.md                        |  6 +++---
 yarn/README.md                                   |  2 +-
 .../elasticsearch/hadoop/yarn/cfg/cfg.properties |  4 +---
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 22b886156..091c8718a 100644
--- a/README.md
+++ b/README.md
@@ -15,24 +15,14 @@ ES-Hadoop 2.0.x and 2.1.x are compatible with Elasticsearch __1.X__ *only*
 
 ## Installation
 
-### Stable Release (currently `2.1.2`)
+### Stable Release (currently `2.2.0`)
 Available through any Maven-compatible tool:
 
 ```xml
 <dependency>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-hadoop</artifactId>
-  <version>2.1.2</version>
-</dependency>
-```
-### Beta Release (currently `2.2.0-rc1`)
-Available through any Maven-compatible tool:
-
-```xml
-<dependency>
-  <groupId>org.elasticsearch</groupId>
-  <artifactId>elasticsearch-hadoop</artifactId>
-  <version>2.2.0-rc1</version>
+  <version>2.2.0</version>
 </dependency>
 ```
 or as a stand-alone [ZIP](http://www.elastic.co/downloads/hadoop).
@@ -45,7 +35,7 @@ Grab the latest nightly build from the [repository](http://oss.sonatype.org/cont
 <dependency>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-hadoop</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.3.0.BUILD-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/docs/src/reference/asciidoc/index.adoc b/docs/src/reference/asciidoc/index.adoc
index 354f49457..ef2138720 100644
--- a/docs/src/reference/asciidoc/index.adoc
+++ b/docs/src/reference/asciidoc/index.adoc
@@ -10,9 +10,9 @@
 :ey:	Elasticsearch on YARN
 :ref:  	http://www.elastic.co/guide/en/elasticsearch/reference/2.0
 :description: Reference documentation of {eh}
-:ver:	2.2.0-rc1
-:ver-d: 2.2.0.BUILD-SNAPSHOT
-:es-v:	2.1.1
+:ver:	2.2.0
+:ver-d: 2.2.1.BUILD-SNAPSHOT
+:es-v:	2.2.0
 :sp-v:	1.6.0
 :st-v:	0.9.5
 :pg-v:	0.15.0
diff --git a/gradle.properties b/gradle.properties
index 9755451e2..18c0567f4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,8 +36,8 @@ hamcrestVersion = 1.3
 antlrVersion = 3.4
 thriftVersion = 0.5.0
 #esVersion = 1.7.1
-esVersion = 2.2.0-SNAPSHOT
-esVersionStable = 2.1.1
+esVersion = 2.2.0
+esVersionStable = 2.2.0
 
 luceneVersion = 5.3.1
 groovyVersion = 2.4.4
@@ -45,4 +45,4 @@ groovyVersion = 2.4.4
 # --------------------
 # Project wide version
 # --------------------
-version=2.2.0.BUILD-SNAPSHOT
+version=2.2.0
diff --git a/repository-hdfs/README.md b/repository-hdfs/README.md
index c2328d086..7a3932cee 100644
--- a/repository-hdfs/README.md
+++ b/repository-hdfs/README.md
@@ -54,10 +54,10 @@ _After_ installing the plugin on _every_ Elasticsearch node, be sure to _restart
 
 ### Stable version
 As with any other plugin, simply run:
-`bin/plugin install elasticsearch/elasticsearch-repository-hdfs/2.2.0-rc1`
+`bin/plugin install elasticsearch/elasticsearch-repository-hdfs/2.2.0`
 
 When looking for `light` or `hadoop2` artifacts use:
-`bin/plugin install elasticsearch/elasticsearch-repository-hdfs/2.2.0.rc1-<classifier>`
+`bin/plugin install elasticsearch/elasticsearch-repository-hdfs/2.2.0-<classifier>`
 
 ### Development Snapshot
 To install the latest snapshot, please install the plugin manually using:
@@ -69,7 +69,7 @@ Or grab the latest nightly build from the [repository](http://oss.sonatype.org/c
 <dependency>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-repository-hdfs</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.3.0.BUILD-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/yarn/README.md b/yarn/README.md
index b38ad35d6..ac8a77474 100644
--- a/yarn/README.md
+++ b/yarn/README.md
@@ -49,7 +49,7 @@ Each command should be self-explanatory. The typical usage scenario is:
 This is a _one-time_ action; if you already have Elasticsearch at hand, deploy it under `downloads` folder. To wit:
 
     > hadoop jar elasticsearch-yarn-<version> -download-es
-    Downloading Elasticsearch 2.1.1
+    Downloading Elasticsearch 2.2.0
     Downloading ......................................................................................DONE
 
 ### Provision Elasticsearch into HDFS
diff --git a/yarn/src/main/resources/org/elasticsearch/hadoop/yarn/cfg/cfg.properties b/yarn/src/main/resources/org/elasticsearch/hadoop/yarn/cfg/cfg.properties
index 5a54c8ba9..fd3ff92a8 100644
--- a/yarn/src/main/resources/org/elasticsearch/hadoop/yarn/cfg/cfg.properties
+++ b/yarn/src/main/resources/org/elasticsearch/hadoop/yarn/cfg/cfg.properties
@@ -7,9 +7,7 @@ app.queue=default
 
 # Local Provisioning
 download.local.dir=./downloads/
-download.es.full.url=https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/${esVersionStable}/elasticsearch-${esVersionStable}.zip
-download.es.url=http://www.elastic.co/downloads/elasticsearch/
-
+download.es.url=https://download.elastic.co/elasticsearch/elasticsearch/
 es.version=${esVersionStable}
 
 # Provisioning