logstash-input-log4j 0.1.4-java → 0.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e199893dc33e7d3c95dde20e6b5fadae73ace090
-  data.tar.gz: 2bb6bb1025113d1353c9995f8a9b16b21d7140f2
+  metadata.gz: 9c1ffa72c5d32d8da0466ec1a7314ae903cf81b5
+  data.tar.gz: b30d296e676067e63dab5177e292779d777d0478
 SHA512:
-  metadata.gz: 6380bbc0e2ca22ad6cc57bd8102e7a34377b8682d471fc76c75340a49f0994982964949bd5aefeaf38ab002968b04c5873807dfd0e2438b9eb683525bc6e6370
-  data.tar.gz: 9734cf7405f35f2877fcba6c40566ef8d673b10e9f85fad36c2a29384bd8cd3860a6f5c054602bbd8c39adafb90169b2ce997205f72ebd8e650909c8cafe7e0c
+  metadata.gz: 0b781d3f39962b60d4ebf92397cfb5f65449e19715179f32b3606c63410450b167c4367765a85f24ab327b0f02c55c8702ae80b5678d4232eff55ff0f8b83521
+  data.tar.gz: 0be60d90a1731660f8ce27d570367e342b6e665035f28e56e50a47366505a0f65843b929e7e222ddf679eeac86483e3c22e75a9d38378ee87a79cb4a2f97637c

data/.gitignore

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

data/lib/logstash-input-log4j_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-input-log4j.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-log4j'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events over a TCP socket from a Log4j SocketAppender"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = `git ls-files`.split($\)
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,23 +20,11 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   s.platform = 'java'
-  # Jar dependencies
-  s.requirements << "jar 'log4j:log4j', '1.2.17'"
-
-  # Gem dependencies
-  # 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'
+
   s.add_runtime_dependency 'logstash-codec-plain'
 
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+
   s.add_development_dependency 'logstash-devutils'
 end
 

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-log4j
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
-- !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-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,9 +70,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/logstash-input-log4j_jars.rb
 - lib/logstash/inputs/log4j.rb
 - logstash-input-log4j.gemspec
 - spec/inputs/log4j_spec.rb
+- vendor/jar-dependencies/runtime-jars/log4j-1.2.17.jar
 homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -135,10 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jar 'log4j:log4j', '1.2.17'
+requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Read events over a TCP socket from a Log4j SocketAppender