logstash-core 1.5.3.snapshot2-java → 1.5.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167268ee29e6f1789d22217c70c8f9860f4c1c45
-  data.tar.gz: 480dd1f7ca4035fe7352d8a4e09eb1e5609de086
+  metadata.gz: e4fe653fa32206e5a0c25e9a067d722d344c4d85
+  data.tar.gz: ac8563269d85a139e17616ff86c5334a0eec1379
 SHA512:
-  metadata.gz: aebae3223652b1e4c7605a20ad8ca0d9d4c30cc13160511c43e33e701925c269cb95f90c8d3685043e815b824eabaa335ca595e0bd574f0ec9e4d5c97a6f47a4
-  data.tar.gz: c7d4f1d085f6da87187a10d89f8f618aacc4135cc9526096d11297a675bfcf4b5f684ab2cd4e36faafbd9031be6da08dfda895bb7383d087bf072f16b792984f
+  metadata.gz: 4a1901cf466e00679a94de5e201ab7a0d8d4a0439157253dfe2dd8aaec3d59587a5909d425b4c81707d1fccf96c310bccbf0e80800db03804d0eea75d730728b
+  data.tar.gz: 8b76d83a38e88b36bfa10e4f497c6fead84a8bf850a5e9818965ee586cb09053cbcb0caddb9f6ecf91eef7b0c0f3e51ae8e1134102cff95c2d102990b9d1a38e

data/lib/logstash-core.rb

@@ -1,2 +1,3 @@
+# encoding: utf-8
 module LogStash
-end
+end

data/lib/logstash/agent.rb

@@ -39,6 +39,11 @@ class LogStash::Agent < Clamp::Command
   option ["-V", "--version"], :flag,
     I18n.t("logstash.agent.flag.version")
 
+ option ["-p", "--pluginpath"] , "PATH",
+   I18n.t("logstash.agent.flag.pluginpath"),
+   :multivalued => true,
+   :attribute_name => :plugin_paths
+
   option ["-t", "--configtest"], :flag,
     I18n.t("logstash.agent.flag.configtest"),
     :attribute_name => :config_test
@@ -204,6 +209,7 @@ class LogStash::Agent < Clamp::Command
   # Log file stuff, plugin path checking, etc.
   def configure
     configure_logging(log_file)
+    configure_plugin_paths(plugin_paths)
   end # def configure
 
   # Point logging at a specific path.
@@ -229,7 +235,6 @@ class LogStash::Agent < Clamp::Command
       else
         @logger.level = :warn
       end
-
     end
 
     if log_file
@@ -254,6 +259,15 @@ class LogStash::Agent < Clamp::Command
     # http://jira.codehaus.org/browse/JRUBY-7003
   end # def configure_logging
 
+  # add the given paths for ungemified/bare plugins lookups
+  # @param paths [String, Array<String>] plugins path string or list of path strings to add
+  def configure_plugin_paths(paths)
+    Array(paths).each do |path|
+      fail(I18n.t("logstash.agent.configuration.plugin_path_missing", :path => path)) unless File.directory?(path)
+      LogStash::Environment.add_plugin_path(path)
+    end
+  end
+
   def load_config(path)
     begin
       uri = URI.parse(path)

data/lib/logstash/config/mixin.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require "logstash/namespace"
 require "logstash/config/registry"
 require "logstash/logging"

data/lib/logstash/environment.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/errors"
 require "logstash/version"
 
@@ -99,6 +100,14 @@ module LogStash
       I18n.reload!
       fail "No locale? This is a bug." if I18n.available_locales.empty?
     end
+
+    # add path for bare/ungemified plugins lookups. the path must be the base path that will include
+    # the dir structure 'logstash/TYPE/NAME.rb' where TYPE is 'inputs' 'filters', 'outputs' or 'codecs'
+    # and NAME is the name of the plugin
+    # @param path [String] plugins path to add
+    def add_plugin_path(path)
+      $LOAD_PATH << path
+    end
   end
 end
 

data/lib/logstash/java_integration.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "java"
 
 # this is mainly for usage with JrJackson json parsing in :raw mode which genenerates
@@ -96,4 +97,4 @@ module java::util::Collection
   def inspect
     "<#{self.class.name}:#{self.hashCode} #{self.to_a(&:inspect)}>"
   end
-end
+end

data/lib/logstash/namespace.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 module LogStash
   module Inputs; end
   module Outputs; end

data/lib/logstash/patches.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/patches/bugfix_jruby_2558"
 require "logstash/patches/cabin"
 require "logstash/patches/profile_require_calls"

data/lib/logstash/patches/bugfix_jruby_2558.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/environment"
 
 if LogStash::Environment.windows? && LogStash::Environment.jruby?

data/lib/logstash/patches/bundler.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Bundler monkey patches
 module ::Bundler
   # Patch bundler to write a .lock file specific to the version of ruby.

data/lib/logstash/patches/cabin.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 if ENV["PROFILE_BAD_LOG_CALLS"] || ($DEBUGLIST || []).include?("log")
   # Set PROFILE_BAD_LOG_CALLS=1 in your environment if you want
   # to track down logger calls that cause performance problems

data/lib/logstash/patches/rubygems.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # monkey patch RubyGems to silence ffi warnings:
 #
 # WARN: Unresolved specs during Gem::Specification.reset:

data/lib/logstash/patches/stronger_openssl_defaults.rb

@@ -1,4 +1,4 @@
-
+# encoding: utf-8
 require "openssl"
 
 # :nodoc:
@@ -51,12 +51,18 @@ class OpenSSL::SSL::SSLContext
   end
 
   # Overwriting the DEFAULT_PARAMS const idea from here: https://www.ruby-lang.org/en/news/2014/10/27/changing-default-settings-of-ext-openssl/
+  #
+  # This monkeypatch doesn't enforce a `VERIFY_MODE` on the SSLContext,
+  # SSLContext are both used for the client and the server implementation,
+  # If set the `verify_mode` to peer the server wont accept any connection,
+  # because it will try to verify the client certificate, this is a protocol
+  # details implemented at the plugin level.
+  #
+  # For more details see: https://github.com/elastic/logstash/issues/3657
   remove_const(:DEFAULT_PARAMS) if const_defined?(:DEFAULT_PARAMS)
   DEFAULT_PARAMS = {
     :ssl_version => "SSLv23",
-    :verify_mode => OpenSSL::SSL::VERIFY_PEER,
     :ciphers => MOZILLA_INTERMEDIATE_CIPHERS,
     :options => __default_options # Not a constant because it's computed at start-time.
   }
-
 end

data/lib/logstash/program.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require "logstash/namespace"
 
 module LogStash::Program

data/lib/logstash/runner.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 Thread.abort_on_exception = true
 Encoding.default_external = Encoding::UTF_8
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")

data/lib/logstash/string_interpolation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "thread_safe"
 require "forwardable"
 
@@ -17,9 +18,9 @@ module LogStash
       if template.is_a?(Float) && (template < MIN_FLOAT_BEFORE_SCI_NOT || template >= MAX_FLOAT_BEFORE_SCI_NOT)
         return ("%.15f" % template).sub(/0*$/,"")
       end
-      
+
       template = template.to_s
-      
+
       return template if not_cachable?(template)
 
       compiled = CACHE.get_or_default(template, nil) || CACHE.put(template, compile_template(template))

data/lib/logstash/util/accessors.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require "logstash/namespace"
 require "logstash/util"
 require "thread_safe"

data/lib/logstash/util/decorators.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require "logstash/namespace"
 require "logstash/util"
 

data/lib/logstash/util/filetools.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "net/http"
 require "uri"
 require "digest/sha1"

data/lib/logstash/util/java_version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cabin'
 
 module LogStash::Util::JavaVersion
@@ -30,6 +31,9 @@ module LogStash::Util::JavaVersion
     # The regex below parses this all correctly http://rubular.com/r/sInQc3Nc7f
 
     match = version_string.match(/\A(\d+)\.(\d+)\.(\d+)(_(\d+))?(-(.+))?\Z/)
+
+    return nil unless match
+
     major, minor, patch, ufull, update, bfull, build = match.captures
 
     {
@@ -58,4 +62,4 @@ module LogStash::Util::JavaVersion
       false
     end
   end
-end
+end

data/lib/logstash/util/plugin_version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'logstash/errors'
 require 'rubygems/version'
 require 'forwardable'

data/lib/logstash/util/prctl.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 module LibC
   require "ffi"
   extend FFI::Library

data/lib/logstash/util/reporter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class InflightEventsReporter
   def self.logger=(logger)
     @logger = logger

data/lib/logstash/util/retryable.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LogStash
   module Retryable
     # execute retryable code block
@@ -36,4 +37,4 @@ module LogStash
       end
     end
   end
-end
+end

data/lib/logstash/util/unicode_trimmer.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LogStash::Util::UnicodeTrimmer
   # The largest possible unicode chars are 4 bytes
   # http://stackoverflow.com/questions/9533258/what-is-the-maximum-number-of-bytes-for-a-utf-8-encoded-character

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "1.5.3.snapshot2"
+LOGSTASH_VERSION = "1.5.4"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.

data/spec/core/conditionals_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module ConditionalFanciness

data/spec/core/config_mixin_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/config/mixin"
 

data/spec/core/environment_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/environment"
 
@@ -38,7 +39,18 @@ describe LogStash::Environment do
         allow(Dir).to receive(:glob).and_return([])
         expect { subject.load_runtime_jars! }.to raise_error
       end
+    end
+  end
+
+  context "add_plugin_path" do
+    let(:path) { "/some/path" }
+
+    before(:each) { expect($LOAD_PATH).to_not include(path) }
+    after(:each) { $LOAD_PATH.delete(path) }
 
+    it "should add the path to $LOAD_PATH" do
+      expect{subject.add_plugin_path(path)}.to change{$LOAD_PATH.size}.by(1)
+      expect($LOAD_PATH).to include(path)
     end
   end
 end

data/spec/core/event_spec.rb

@@ -99,6 +99,16 @@ describe LogStash::Event do
       it "should return a json string if the key is a hash" do
         expect(subject.sprintf("%{[j][k3]}")).to eq("{\"4\":\"m\"}")
       end
+
+      context "#encoding" do
+        it "should return known patterns as UTF-8" do
+          expect(subject.sprintf("%{message}").encoding).to eq(Encoding::UTF_8)
+        end
+
+        it "should return unknown patterns as UTF-8" do
+          expect(subject.sprintf("%{unkown_pattern}").encoding).to eq(Encoding::UTF_8)
+        end
+      end
     end
 
     context "#[]" do

data/spec/core/pipeline_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 
 class DummyInput < LogStash::Inputs::Base

data/spec/core/plugin_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/plugin"
 

data/spec/core/runner_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/runner"
 require "stud/task"

data/spec/core/timestamp_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/timestamp"
 

data/spec/coverage_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Useful module to help loading all logstash content when
 # running coverage analysis
 module CoverageHelper

data/spec/license_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'rakelib/default_plugins'
 

data/spec/logstash/agent_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe LogStash::Agent do
@@ -22,7 +23,7 @@ describe LogStash::Agent do
         end
       end
     end
-    
+
     context "when remote" do
       context 'supported scheme' do
         let(:path) { "http://test.local/superconfig.conf" }
@@ -34,4 +35,28 @@ describe LogStash::Agent do
       end
     end
   end
+
+  context "--pluginpath" do
+    let(:single_path) { "/some/path" }
+    let(:multiple_paths) { ["/some/path1", "/some/path2"] }
+
+    it "should add single valid dir path to the environment" do
+      expect(File).to receive(:directory?).and_return(true)
+      expect(LogStash::Environment).to receive(:add_plugin_path).with(single_path)
+      subject.configure_plugin_paths(single_path)
+    end
+
+    it "should fail with single invalid dir path" do
+      expect(File).to receive(:directory?).and_return(false)
+      expect(LogStash::Environment).not_to receive(:add_plugin_path)
+      expect{subject.configure_plugin_paths(single_path)}.to raise_error(LogStash::ConfigurationError)
+    end
+
+    it "should add multiple valid dir path to the environment" do
+      expect(File).to receive(:directory?).exactly(multiple_paths.size).times.and_return(true)
+      multiple_paths.each{|path| expect(LogStash::Environment).to receive(:add_plugin_path).with(path)}
+      subject.configure_plugin_paths(multiple_paths)
+    end
+  end
 end
+

data/spec/logstash/patches_spec.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+require "socket"
 require "logstash/patches"
+require "flores/pki"
 
 describe "OpenSSL defaults" do
   subject { OpenSSL::SSL::SSLContext.new }
@@ -22,4 +25,66 @@ describe "OpenSSL defaults" do
     # SSLContext#ciphers returns an array of [ciphername, tlsversion, key_bits, alg_bits]
     expect(encryption_bits).not_to be_any { |bits| bits < 128 }
   end
+
+  it "should not include a default `verify_mode`" do
+    expect(OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:verify_mode]).to eq(nil)
+  end
+
+  context "SSLSocket" do
+    # Code taken from the flores library by @jordansissels,
+    # https://github.com/jordansissel/ruby-flores/blob/master/spec/flores/pki_integration_spec.rb
+    # since these helpers were created to fix this particular issue
+    let(:csr) { Flores::PKI::CertificateSigningRequest.new }
+    # Here, I use a 1024-bit key for faster tests. 
+    # Please do not use such small keys in production.
+    let(:key_bits) { 1024 }
+    let(:key) { OpenSSL::PKey::RSA.generate(key_bits, 65537) }
+    let(:certificate_duration) { Flores::Random.number(1..86400) }
+
+    context "with self-signed client/server certificate" do
+      let(:certificate_subject) { "CN=server.example.com" }
+      let(:certificate) { csr.create }
+
+      # Returns [socket, address, port]
+      let(:listener) { Flores::Random.tcp_listener }
+      let(:server) { listener[0] }
+      let(:server_address) { listener[1] }
+      let(:server_port) { listener[2] }
+
+      let(:server_context) { OpenSSL::SSL::SSLContext.new }
+      let(:client_context) { OpenSSL::SSL::SSLContext.new }
+
+      before do
+        csr.subject = certificate_subject
+        csr.public_key = key.public_key
+        csr.start_time = Time.now
+        csr.expire_time = csr.start_time + certificate_duration
+        csr.signing_key = key
+        csr.want_signature_ability = true
+
+        server_context.cert = certificate
+        server_context.key = key
+
+        client_store = OpenSSL::X509::Store.new
+        client_store.add_cert(certificate)
+        client_context.cert_store = client_store
+        client_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        ssl_server = OpenSSL::SSL::SSLServer.new(server, server_context)
+        Thread.new do
+          begin
+            ssl_server.accept
+          rescue => e
+            puts "Server accept failed: #{e}"
+          end
+        end
+      end
+
+      it "should successfully connect as a client" do
+        socket = TCPSocket.new(server_address, server_port)
+        ssl_client = OpenSSL::SSL::SSLSocket.new(socket, client_context)
+        expect { ssl_client.connect }.not_to raise_error
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require_relative 'coverage_helper'
 # In order to archive an expected coverage analysis we need to eager load
 # all logstash code base, otherwise it will not get a good analysis.

data/spec/util/java_version_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'logstash/util/java_version'
 
@@ -31,6 +32,14 @@ describe "LogStash::Util::JavaVersion" do
       expect(mod.parse_java_version(nil)).to be_nil
     end
 
+    it "should return nil on non-hotspot javas" do
+      # Not sure this is what is being returned, but it doesn't match the
+      # regex, which is the point
+      expect(mod.parse_java_version("JCL - 20140103_01 based on Oracle 7u51-b11
+
+")).to be_nil
+    end
+
     shared_examples("version parsing") do |desc, string, major, minor, patch, update, build|
       context("#{desc} with version #{string}") do
         subject(:parsed) { LogStash::Util::JavaVersion.parse_java_version(string) }
@@ -63,4 +72,4 @@ describe "LogStash::Util::JavaVersion" do
     include_examples("version parsing", "an update+build", "1.4.0_03-beta", 1, 4, 0, 3, "beta")
   end
 
-end
+end

data/spec/util/plugin_version_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 require "logstash/util/plugin_version"
 

data/spec/util_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 require "logstash/util"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.3.snapshot2
+  version: 1.5.4
 platform: java
 authors:
 - Jordan Sissel
@@ -10,162 +10,162 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cabin
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+  name: cabin
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
+  name: pry
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
+  name: stud
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: clamp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.0.19
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
+  name: clamp
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: filesize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.6.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.4
+  name: filesize
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: gems
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
+  name: gems
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: treetop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 1.5.0
+  name: treetop
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: i18n
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.9
+  name: i18n
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: minitar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
+  name: minitar
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
+  name: thread_safe
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.9
+  name: jrjackson
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.9
 description: The core components of logstash, the scalable log and event management tool
 email:
 - jls@semicomplete.com
@@ -270,12 +270,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash