Cleanup jar dependencies

- move Jarfile dependency into gemspec
- upgrade curator to 2.7.1
- fix tests
- remove transient dependencies
This commit is contained in:
Dirk Koehler 2015-03-26 22:55:00 -07:00
parent 5f783476f8
commit 163c9d70c6
5 changed files with 16 additions and 18 deletions

View File

@ -1 +0,0 @@
jar 'org.apache.curator:curator-framework:2.4.0'

View File

@ -31,13 +31,9 @@ Gem::Specification.new do |s|
# dependency of your gem. if it is a runtime dependencies the require_jars
# file will be overwritten during installation.
s.add_dependency 'jar-dependencies', '~>0.1.2'
s.requirements << "jar org.apache.kafka:kafka_2.10, 0.8.1.1"
s.requirements << "jar org.mod4j.org.eclipse.xtext:log4j, 1.2.15"
s.requirements << "jar org.scala-lang:scala-library, 2.10.1"
s.requirements << "jar com.yammer.metrics:metrics-core, 2.2.0"
s.requirements << "jar org.slf4j:slf4j-api, 1.7.2"
s.requirements << "jar log4j:log4j, 1.2.17"
s.requirements << "jar com.101tec:zkclient, 0.3"
s.requirements << "jar org.apache.kafka:kafka_2.10, ~>0.8.1.1"
s.requirements << "jar org.apache.curator:curator-framework, ~>2.7"
s.requirements << "jar log4j:log4j, ~>1.2"
s.require_paths = ["lib"]
s.platform = 'java'
else

View File

@ -31,5 +31,5 @@ module Hermann
end
if Hermann.jruby?
require 'hermann/java'
require 'hermann/java'
end

View File

@ -1,15 +1,17 @@
# this is a generated file, to avoid over-writing it just delete this comment
require 'jar_dependencies'
require_jar( 'junit', 'junit', '3.8.1' )
require_jar( 'com.101tec', 'zkclient', '0.3' )
require_jar( 'com.yammer.metrics', 'metrics-core', '2.2.0' )
require_jar( 'log4j', 'log4j', '1.2.17' )
require_jar( 'jline', 'jline', '0.9.94' )
require_jar( 'net.sf.jopt-simple', 'jopt-simple', '3.2' )
require_jar( 'org.apache.zookeeper', 'zookeeper', '3.3.4' )
require_jar( 'org.mod4j.org.eclipse.xtext', 'log4j', '1.2.15' )
require_jar( 'org.slf4j', 'slf4j-api', '1.7.2' )
require_jar( 'org.apache.kafka', 'kafka_2.10', '0.8.1.1' )
require_jar( 'org.scala-lang', 'scala-library', '2.10.1' )
require_jar( 'org.apache.curator', 'curator-client', '2.7.1' )
require_jar( 'org.apache.zookeeper', 'zookeeper', '3.3.4' )
require_jar( 'net.sf.jopt-simple', 'jopt-simple', '3.2' )
require_jar( 'org.xerial.snappy', 'snappy-java', '1.0.5' )
require_jar( 'junit', 'junit', '3.8.1' )
require_jar( 'com.yammer.metrics', 'metrics-core', '2.2.0' )
require_jar( 'com.google.guava', 'guava', '16.0.1' )
require_jar( 'org.apache.kafka', 'kafka_2.10', '0.8.1.1' )
require_jar( 'jline', 'jline', '0.9.94' )
require_jar( 'com.101tec', 'zkclient', '0.3' )
require_jar( 'org.apache.curator', 'curator-framework', '2.7.1' )

View File

@ -4,7 +4,7 @@ require 'hermann/errors'
describe Hermann::Discovery::Zookeeper do
let(:zk) { double }
let(:zookeepers) { double }
let(:zookeepers) { 'zk:2181' }
let(:node) { {'host'=>'f', 'port'=>1 }.to_json }
subject { described_class.new(zookeepers) }
@ -73,6 +73,7 @@ describe Hermann::Discovery::Zookeeper do
end
it 'returns nil node not found' do
expect(described_class.usable?).to be(true)
allow(zk).to receive(:get).and_raise(ZK::Exceptions::NoNode)
expect(subject.send(:fetch_znode, zk, id)).to be_nil
end