From fdbc19214819fac90a9b83b86b1fada9e6d71b99 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 5 Dec 2019 19:14:26 +0530 Subject: [PATCH] Update elasticsearch* dependencies --- debian/control | 6 ++++++ debian/patches/0050-relax-stable-libs.patch | 8 ++++++-- debian/patches/0480-embed-elasticsearch-model.patch | 2 +- debian/patches/0480-embed-elasticsearch-rails.patch | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 3e2452518b..2c3edf65af 100644 --- a/debian/control +++ b/debian/control @@ -127,6 +127,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-unf-ext (>= 0.0.7.4), # Seed data ruby-seed-fu (>= 2.3.7~), +# Search +# ruby-elasticsearch-model (>= 0.1.9~), embedded +# ruby-elasticsearch-rails (>= 0.1.9~), embedded + ruby-elasticsearch-api (>= 5.0.3~), + ruby-aws-sdk, +# ruby-faraday-middleware-aws-signers-v4, embedded # Markdown and HTML processing ruby-html-pipeline (>= 2.8~), ruby-task-list (>= 2.2~), diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 07b63a7731..00a07330dc 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -123,7 +123,7 @@ gitlab Gemfile gem 'fog-google', '~> 1.9' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' -@@ -125,7 +125,7 @@ +@@ -125,46 +125,46 @@ gem 'unf', '~> 0.1.4' # Seed data @@ -132,7 +132,11 @@ gitlab Gemfile # Search gem 'elasticsearch-model', '~> 0.1.9' -@@ -136,35 +136,35 @@ + gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation' +-gem 'elasticsearch-api', '5.0.3' ++gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3' + gem 'aws-sdk' + gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' diff --git a/debian/patches/0480-embed-elasticsearch-model.patch b/debian/patches/0480-embed-elasticsearch-model.patch index e76b618d05..72065a3231 100644 --- a/debian/patches/0480-embed-elasticsearch-model.patch +++ b/debian/patches/0480-embed-elasticsearch-model.patch @@ -7,5 +7,5 @@ -gem 'elasticsearch-model', '~> 0.1.9' +gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model' gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation' - gem 'elasticsearch-api', '5.0.3' + gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3' gem 'aws-sdk' diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch index 425bd4e1b3..9171692cbd 100644 --- a/debian/patches/0480-embed-elasticsearch-rails.patch +++ b/debian/patches/0480-embed-elasticsearch-rails.patch @@ -6,6 +6,6 @@ gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model' -gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation' +gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' - gem 'elasticsearch-api', '5.0.3' + gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3' gem 'aws-sdk' gem 'faraday_middleware-aws-signers-v4'