From 8d19e6cef9689bec1b943dadba6eb644f6d7f52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Tue, 5 Feb 2019 16:38:49 +0000 Subject: [PATCH] Cleanup dependencies (#10171) * cleanup Gemfile.template dependencies * cleanup logstash-core gem dependencies --- Gemfile.template | 31 +++++++++++------------- logstash-core/logstash-core.gemspec | 37 +++++++++++++---------------- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/Gemfile.template b/Gemfile.template index 45b6a92d5..8b0082e56 100644 --- a/Gemfile.template +++ b/Gemfile.template @@ -4,29 +4,26 @@ source "https://rubygems.org" gem "logstash-core", :path => "./logstash-core" gem "logstash-core-plugin-api", :path => "./logstash-core-plugin-api" -gem "paquet", "~> 0.2.0" -gem "ruby-progressbar", "~> 1.8.1" -gem "builder", "~> 3.2.2" -gem "ci_reporter_rspec", "1.0.0", :group => :development -gem "tins", "1.6", :group => :development +gem "paquet", "~> 0.2" +gem "ruby-progressbar", "~> 1" +gem "builder", "~> 3" +gem "ci_reporter_rspec", "~> 1", :group => :development gem "rspec", "~> 3.5", :group => :development -gem "logstash-devutils", "= 1.3.5", :group => :development +gem "logstash-devutils", "~> 1", :group => :development gem "benchmark-ips", :group => :development -gem "octokit", "3.8.0", :group => :build +gem "octokit", "~> 4", :group => :build gem "stud", "~> 0.0.22", :group => :build -gem "fpm", "~> 1.3.3", :group => :build -gem "rubyzip", "~> 1.2.1", :group => :build -gem "gems", "~> 0.8.3", :group => :build gem "rack-test", :require => "rack/test", :group => :development +gem "fpm", "~> 1.11", :group => :build +gem "rubyzip", "~> 1", :group => :build +gem "gems", "~> 1", :group => :build gem "flores", "~> 0.0.6", :group => :development -gem "term-ansicolor", "~> 1.3.2", :group => :development -gem "json-schema", "~> 2.6", :group => :development -gem "webmock", "~> 3.5.1", :group => :development +gem "atomic", "~> 1" gem "belzebuth", :group => :development +gem "json-schema", "~> 2", :group => :development gem "pleaserun", "~>0.0.28" -gem 'webrick', '~> 1.3.1' -gem "atomic", "<= 1.1.99" -gem "rake", "~> 12.2.1" +gem "rake", "~> 12" +gem "webmock", "~> 3", :group => :development gem "logstash-codec-cef" gem "logstash-codec-collectd" gem "logstash-codec-dots" @@ -119,7 +116,7 @@ gem "logstash-output-null" gem "logstash-output-pipe" gem "logstash-output-rabbitmq" gem "logstash-output-redis" -gem "logstash-output-s3", ">=4.0.9", "<5.0.0" +gem "logstash-output-s3" gem "logstash-output-sns" gem "logstash-output-sqs" gem "logstash-output-stdout" diff --git a/logstash-core/logstash-core.gemspec b/logstash-core/logstash-core.gemspec index e0cd9f29a..036745b6b 100644 --- a/logstash-core/logstash-core.gemspec +++ b/logstash-core/logstash-core.gemspec @@ -47,32 +47,29 @@ Gem::Specification.new do |gem| gem.platform = "java" - gem.add_runtime_dependency "pry", "~> 0.10.1" #(Ruby license) + gem.add_runtime_dependency "pry", "~> 0.12" #(Ruby license) gem.add_runtime_dependency "stud", "~> 0.0.19" #(Apache 2.0 license) - gem.add_runtime_dependency "clamp", "~> 0.6.5" #(MIT license) for command line args/flags - gem.add_runtime_dependency "filesize", "0.0.4" #(MIT license) for :bytes config validator - gem.add_runtime_dependency "gems", "~> 0.8.3" #(MIT license) - gem.add_runtime_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.5" - gem.add_runtime_dependency "rack", '~> 1.6', '>= 1.6.11' - gem.add_runtime_dependency "sinatra", '~> 1.4', '>= 1.4.6' - gem.add_runtime_dependency 'puma', '~> 2.16' - gem.add_runtime_dependency "jruby-openssl", ">= 0.9.20" # >= 0.9.13 Required to support TLSv1.2 - gem.add_runtime_dependency "chronic_duration", "0.10.6" + gem.add_runtime_dependency "clamp", "~> 1" #(MIT license) for command line args/flags + gem.add_runtime_dependency "filesize", "~> 0.2" #(MIT license) for :bytes config validator + gem.add_runtime_dependency "gems", "~> 1" #(MIT license) + gem.add_runtime_dependency "concurrent-ruby", "~> 1" + gem.add_runtime_dependency "rack", '~> 1', '>= 1.6.11' + gem.add_runtime_dependency "sinatra", '~> 1', '>= 1.4.6' + gem.add_runtime_dependency 'puma', '~> 2' + gem.add_runtime_dependency "jruby-openssl", "~> 0.10" # >= 0.9.13 Required to support TLSv1.2 + gem.add_runtime_dependency "chronic_duration", "~> 0.10" - # TODO(sissel): Treetop 1.5.x doesn't seem to work well, but I haven't - # investigated what the cause might be. -Jordan - gem.add_runtime_dependency "treetop", "< 1.5.0" #(MIT license) + gem.add_runtime_dependency "treetop", "~> 1" #(MIT license) - # upgrade i18n only post 0.6.11, see https://github.com/svenfuchs/i18n/issues/270 - gem.add_runtime_dependency "i18n", "= 0.6.9" #(MIT license) + gem.add_runtime_dependency "i18n", "~> 1" #(MIT license) # filetools and rakelib - gem.add_runtime_dependency "minitar", "~> 0.6.1" - gem.add_runtime_dependency "rubyzip", "~> 1.2.1" - gem.add_runtime_dependency "thread_safe", "~> 0.3.5" #(Apache 2.0 license) + gem.add_runtime_dependency "minitar", "~> 0.8" + gem.add_runtime_dependency "rubyzip", "~> 1" + gem.add_runtime_dependency "thread_safe", "~> 0.3.6" #(Apache 2.0 license) gem.add_runtime_dependency "jrjackson", "= #{ALL_VERSIONS.fetch('jrjackson')}" #(Apache 2.0 license) - gem.add_runtime_dependency "elasticsearch", "~> 5.0", ">= 5.0.4" # Ruby client for ES (Apache 2.0 license) - gem.add_runtime_dependency "manticore", '>= 0.5.4', '< 1.0.0' + gem.add_runtime_dependency "elasticsearch", "~> 5" + gem.add_runtime_dependency "manticore", '~> 0.6' end