From 3b03658220b43a4bfeb5e7e8b18ab6e51774bd0a Mon Sep 17 00:00:00 2001 From: Dirk Koehler Date: Fri, 27 Mar 2015 17:25:31 -0700 Subject: [PATCH] Bring back Jarfile and remove curator from dependency --- Jarfile | 1 + hermann.gemspec | 8 ++++---- lib/hermann_jars.rb | 14 +++++--------- 3 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 Jarfile diff --git a/Jarfile b/Jarfile new file mode 100644 index 0000000..79005c2 --- /dev/null +++ b/Jarfile @@ -0,0 +1 @@ +jar 'org.apache.curator:curator-framework:2.4.0' \ No newline at end of file diff --git a/hermann.gemspec b/hermann.gemspec index 1856620..d67a83e 100644 --- a/hermann.gemspec +++ b/hermann.gemspec @@ -30,10 +30,10 @@ Gem::Specification.new do |s| # IMPORTANT: make sure that jar-dependencies is only a development # 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.apache.curator:curator-framework, ~>2.7" - s.requirements << "jar log4j:log4j, ~>1.2" + s.add_dependency 'jar-dependencies', '~>0.1.9' + s.requirements << "jar org.apache.kafka:kafka_2.10, ~>0.8.1.1, ['junit:junit']" + # use log4j-1.2.16+ to as 1.2.15 declares deps which are not in maven central and causes the dep resolution to fail + s.requirements << "jar log4j:log4j, ~>1.2.16" s.require_paths = ["lib"] s.platform = 'java' else diff --git a/lib/hermann_jars.rb b/lib/hermann_jars.rb index 689704f..9bb9a30 100644 --- a/lib/hermann_jars.rb +++ b/lib/hermann_jars.rb @@ -1,17 +1,13 @@ # this is a generated file, to avoid over-writing it just delete this comment require 'jar_dependencies' -require_jar( 'log4j', 'log4j', '1.2.17' ) -require_jar( 'org.slf4j', 'slf4j-api', '1.7.2' ) -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' ) +require_jar( 'log4j', 'log4j', '1.2.17' ) +require_jar( 'org.scala-lang', 'scala-library', '2.10.1' ) +require_jar( 'org.slf4j', 'slf4j-api', '1.7.2' ) +require_jar( 'com.yammer.metrics', 'metrics-core', '2.2.0' ) +require_jar( 'org.apache.kafka', 'kafka_2.10', '0.8.1.1' )