Skip to content

Commit

Permalink
Clean up jar dependencies code and so we end embedded dependencies th…
Browse files Browse the repository at this point in the history
…e same gem. To do so I introduced a common code to load jars so we aim to simplify the management of jars in the long run. This code is actually using a module extracted into a common gem.

Version 0.2.1 bump

cleanup temporary gem usage for development

ammend wrong places jar manager

refactor the files into the vendor dir as we discussed during the review process

Fixes elastic#101
  • Loading branch information
Pere Urbon-Bayes authored and jordansissel committed Apr 14, 2015
1 parent 71617cf commit d786e0d
Show file tree
Hide file tree
Showing 21 changed files with 7 additions and 16 deletions.
1 change: 0 additions & 1 deletion .gitignore
@@ -1,4 +1,3 @@
*.gem
Gemfile.lock
.bundle
vendor
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,2 +1,2 @@
source 'https://rubygems.org'
gemspec
gemspec
5 changes: 5 additions & 0 deletions 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")
15 changes: 1 addition & 14 deletions 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"
Expand All @@ -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']
Expand All @@ -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'
Expand Down
Binary file not shown.
Binary file added vendor/jar-dependencies/runtime-jars/asm-4.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d786e0d

Please sign in to comment.