From 2ba7fe97677088b04bc2d9f0fa0c45b7975312f4 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 13 Mar 2020 17:40:39 +0530 Subject: [PATCH] Fix dependency versions of elasticsearch-* gems --- debian/patches/0480-embed-elasticsearch-model.patch | 2 +- debian/patches/0480-embed-elasticsearch-rails.patch | 4 ++-- .../0480-embed-faraday-middleware-aws-signers-v4.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/0480-embed-elasticsearch-model.patch b/debian/patches/0480-embed-elasticsearch-model.patch index 384891a1f3..11476bb489 100644 --- a/debian/patches/0480-embed-elasticsearch-model.patch +++ b/debian/patches/0480-embed-elasticsearch-model.patch @@ -5,7 +5,7 @@ # Search -gem 'elasticsearch-model', '~> 6.1' -+gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model' ++gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '~> 6.8' gem 'aws-sdk' diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch index 94f5890b04..304f8c2693 100644 --- a/debian/patches/0480-embed-elasticsearch-rails.patch +++ b/debian/patches/0480-embed-elasticsearch-rails.patch @@ -3,9 +3,9 @@ @@ -129,7 +129,7 @@ # Search - gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model' + gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' -gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' -+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' ++gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' gem 'elasticsearch-api', '~> 6.8' gem 'aws-sdk' gem 'faraday_middleware-aws-signers-v4' diff --git a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch index 84ba86be63..e3b340da5b 100644 --- a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch +++ b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch @@ -1,7 +1,7 @@ --- a/Gemfile +++ b/Gemfile @@ -132,7 +132,7 @@ - gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' + gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' gem 'elasticsearch-api', '~> 6.8' gem 'aws-sdk' -gem 'faraday_middleware-aws-signers-v4'