From be320ea7a2d9ae7442707b550653c8e599357926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Wed, 8 Jul 2015 12:07:32 +0200
Subject: [PATCH] Bump elasticsearch version to 1.6.0

---
 .travis.yml                                                 | 4 ++--
 circle.yml                                                  | 6 +++---
 .../vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afaa3012d2..36be727185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@ services:
 before_install:
   - composer self-update --no-progress --no-interaction
   - sudo apt-get purge elasticsearch
-  - wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb && sudo dpkg -i --force-confnew elasticsearch-1.3.2.deb
-  - sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0
+  - curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb && sudo dpkg -i --force-confnew elasticsearch-1.6.0.deb
+  - sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0
   - sudo service elasticsearch start
   - echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
diff --git a/circle.yml b/circle.yml
index 08cadf68d9..5dffbf57bc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -15,7 +15,7 @@ machine:
 
 dependencies:
   cache_directories:
-    - elasticsearch-1.3.2 # relative to the build directory
+    - elasticsearch-1.6.0 # relative to the build directory
     - node_modules
   pre:
     - yes '' | pecl install imagick
@@ -23,8 +23,8 @@ dependencies:
     - yes '' | pecl install zmq-beta
     - sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini
   post:
-    - if [[ ! -e elasticsearch-1.3.2 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.3.2.tar.gz && tar -xvf elasticsearch-1.3.2.tar.gz && elasticsearch-1.3.2/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0; fi
-    - elasticsearch-1.3.2/bin/elasticsearch: {background: true}
+    - if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi
+    - elasticsearch-1.6.0/bin/elasticsearch: {background: true}
     - ./node_modules/.bin/grunt install-assets
     - "./bin/developer assets:compile-less"
 
diff --git a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp
index 7a549bb307..68b71b721f 100644
--- a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp
+++ b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp
@@ -1794,8 +1794,8 @@ if $elasticsearch_values == undef {
 
 if hash_key_equals($elasticsearch_values, 'install', 1) {
   case $::osfamily {
-    'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb' }
-    'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.noarch.rpm' }
+    'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb' }
+    'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.noarch.rpm' }
     default:  { fail('Unrecognized operating system for Elasticsearch') }
   }
 
@@ -1809,5 +1809,5 @@ if hash_key_equals($elasticsearch_values, 'install', 1) {
   # Custom plugins
   elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head' }
   elasticsearch::plugin{'elasticsearch/marvel/latest': module_dir => 'marvel' }
-  elasticsearch::plugin{'elasticsearch/elasticsearch-analysis-icu/2.3.0': module_dir => 'analysis-icu' }
+  elasticsearch::plugin{'elasticsearch/elasticsearch-analysis-icu/2.6.0': module_dir => 'analysis-icu' }
 }