Skip to content

Commit

Permalink
switch to vendoring the jar dependencies
Browse files Browse the repository at this point in the history
This is how things are done in logstash land now
  • Loading branch information
codekitchen committed Jun 17, 2015
1 parent 989fa5b commit 816a106
Show file tree
Hide file tree
Showing 60 changed files with 40 additions and 9 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
*.o
*.a
mkmf.log
lib/logstash-input-kinesis_jars.rb
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ rescue LoadError
end

task default: "spec"

task "vendor_jars" do
sh "mvn dependency:copy-dependencies -DoutputDirectory=vendor/jar-dependencies/runtime-jars/"
end

task build: "vendor_jars"
5 changes: 5 additions & 0 deletions lib/logstash-input-kinesis_jars.rb
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion lib/logstash/inputs/kinesis/version.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Logstash
module Input
module Kinesis
VERSION = "1.2.4"
VERSION = "1.3.0"
end
end
end
8 changes: 1 addition & 7 deletions logstash-input-kinesis.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@ Gem::Specification.new do |spec|

spec.platform = 'java'

spec.requirements << "jar 'com.amazonaws:amazon-kinesis-client', '1.2.1'"

spec.add_runtime_dependency 'jar-dependencies', '~> 0.1.7'
spec.add_runtime_dependency 'ruby-maven', '>= 3.1.1.0.8'
spec.add_runtime_dependency "maven-tools", '~> 1.0.7'

spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec", "~> 3.2.0"
spec.add_development_dependency "logstash-core"
spec.add_development_dependency "logstash-core", ">= 1.5.1"
spec.add_development_dependency "logstash-codec-json"
end
27 changes: 27 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>codekitchen</groupId>
<artifactId>logstash-input-kinesis</artifactId>
<version>dev</version>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-client</artifactId>
<version>1.2.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
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.
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.
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.
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 816a106

Please sign in to comment.