logstash-output-elasticsearch 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7d8af0601791a0fa557ff0e61b995aaa514858
-  data.tar.gz: 7dfd959db33857c44ccc0085709d5e0967a87add
+  metadata.gz: 136da6ebadf886a139362e6cd152faf855536738
+  data.tar.gz: beef59208c09caf119329d6e09fcc1a15042f754
 SHA512:
-  metadata.gz: 3c6af511fd72b689d3fedbae44198bf4f0b2823856289cc541905f8ae74b1929897a251deb2bc0b598cb809df3575d6d5c45f48dcee9706b7cd62b4a78f786f6
-  data.tar.gz: b0d2e8d2d12341ee0c975339e34b7dbfcb8614c1457ca59905fe3b7728159e73ca9f3071213e7c4b62cd2f3f9bc273ea0fdb0eb834549f76b6ba28bc64635764
+  metadata.gz: 56fdc92b4f6c48768d1ec8c111efa2a743342fef4c8b07f126a336b0eaa56597b75e368e9ae609d31c324cac9136c4f21f88f569e4644044ce34016fb958ada0
+  data.tar.gz: aa4ed33227f191b8bb85a3696375f81a517ab09146a4b9ecca75764b82aac88cfd468acd06b7256f2c86083c50a86f05695ea659ac45569489afac6a10a569f7

data/.gitignore

@@ -1,4 +1,3 @@
 *.gem
 Gemfile.lock
 .bundle
-vendor

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/logstash-output-elasticsearch_jars.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+require 'logstash/environment'
+
+ROOT_DIR   = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+LogStash::Environment.load_runtime_jars! File.join(ROOT_DIR, "vendor")

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '0.2.0'
+  s.version         = '0.2.1'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"
@@ -19,9 +19,6 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
-  # Jar dependencies
-  s.requirements << "jar 'org.elasticsearch:elasticsearch', '1.5.0'"
-
   # Gem dependencies
   s.add_runtime_dependency 'concurrent-ruby'
   s.add_runtime_dependency 'elasticsearch', ['>= 1.0.6', '~> 1.0']
@@ -36,16 +33,6 @@ Gem::Specification.new do |s|
   if RUBY_PLATFORM == 'java'
     s.platform = RUBY_PLATFORM
     s.add_runtime_dependency "manticore", '~> 0.3'
-    # Currently there is a blocking issue with the latest (3.1.1.0.9) version of 
-    # `ruby-maven` # and installing jars dependencies. If you are declaring a gem 
-    # in a gemfile # using the :github option it will make the bundle install crash,
-    # before upgrading this gem you need to test the version with any plugins
-    # that require jars.
-    #
-    # Ticket: https://github.com/elasticsearch/logstash/issues/2595
-    s.add_runtime_dependency 'jar-dependencies', '0.1.7'
-    s.add_runtime_dependency 'ruby-maven', '3.1.1.0.8'
-    s.add_runtime_dependency "maven-tools", '1.0.7'
   end
 
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -140,48 +140,6 @@ dependencies:
         version: '0.3'
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jar-dependencies
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: maven-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
@@ -208,12 +166,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/logstash-output-elasticsearch_jars.rb
 - lib/logstash/outputs/elasticsearch.rb
 - lib/logstash/outputs/elasticsearch/elasticsearch-template.json
 - lib/logstash/outputs/elasticsearch/protocol.rb
 - logstash-output-elasticsearch.gemspec
 - spec/outputs/elasticsearch/protocol_spec.rb
 - spec/outputs/elasticsearch_spec.rb
+- vendor/jar-dependencies/runtime-jars/antlr-runtime-3.5.jar
+- vendor/jar-dependencies/runtime-jars/asm-4.1.jar
+- vendor/jar-dependencies/runtime-jars/asm-commons-4.1.jar
+- vendor/jar-dependencies/runtime-jars/elasticsearch-1.5.0.jar
+- vendor/jar-dependencies/runtime-jars/lucene-analyzers-common-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-core-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-grouping-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-highlighter-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-join-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-memory-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-misc-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-queries-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-queryparser-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-sandbox-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-spatial-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-suggest-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/spatial4j-0.4.1.jar
 homepage: http://logstash.net/
 licenses:
 - apache-2.0
@@ -234,10 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jar 'org.elasticsearch:elasticsearch', '1.5.0'
+requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch