diff --git a/.gitignore b/.gitignore index 2b2c322..ae3fdc2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ *.o *.a mkmf.log -lib/logstash-input-kinesis_jars.rb diff --git a/Rakefile b/Rakefile index 739f289..50b7db3 100644 --- a/Rakefile +++ b/Rakefile @@ -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" diff --git a/lib/logstash-input-kinesis_jars.rb b/lib/logstash-input-kinesis_jars.rb new file mode 100644 index 0000000..4211f0f --- /dev/null +++ b/lib/logstash-input-kinesis_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") diff --git a/lib/logstash/inputs/kinesis/version.rb b/lib/logstash/inputs/kinesis/version.rb index 4b4a020..6a88dd0 100644 --- a/lib/logstash/inputs/kinesis/version.rb +++ b/lib/logstash/inputs/kinesis/version.rb @@ -1,7 +1,7 @@ module Logstash module Input module Kinesis - VERSION = "1.2.4" + VERSION = "1.3.0" end end end diff --git a/logstash-input-kinesis.gemspec b/logstash-input-kinesis.gemspec index 3e4f5f0..5ded8e3 100644 --- a/logstash-input-kinesis.gemspec +++ b/logstash-input-kinesis.gemspec @@ -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 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..17f5101 --- /dev/null +++ b/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + codekitchen + logstash-input-kinesis + dev + + + com.amazonaws + amazon-kinesis-client + 1.2.1 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + + + + + diff --git a/vendor/jar-dependencies/runtime-jars/amazon-kinesis-client-1.2.1.jar b/vendor/jar-dependencies/runtime-jars/amazon-kinesis-client-1.2.1.jar new file mode 100644 index 0000000..f8bc1eb Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/amazon-kinesis-client-1.2.1.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-1.9.16.jar new file mode 100644 index 0000000..10dc166 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-autoscaling-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-autoscaling-1.9.16.jar new file mode 100644 index 0000000..ff482d1 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-autoscaling-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudformation-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudformation-1.9.16.jar new file mode 100644 index 0000000..eebe4f5 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudformation-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudfront-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudfront-1.9.16.jar new file mode 100644 index 0000000..f3d15d6 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudfront-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudhsm-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudhsm-1.9.16.jar new file mode 100644 index 0000000..b7ae360 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudhsm-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudsearch-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudsearch-1.9.16.jar new file mode 100644 index 0000000..3bd54f6 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudsearch-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudtrail-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudtrail-1.9.16.jar new file mode 100644 index 0000000..ec5b499 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudtrail-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatch-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatch-1.9.16.jar new file mode 100644 index 0000000..b4aa4f8 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatch-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatchmetrics-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatchmetrics-1.9.16.jar new file mode 100644 index 0000000..397065f Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cloudwatchmetrics-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-codedeploy-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-codedeploy-1.9.16.jar new file mode 100644 index 0000000..b3322d6 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-codedeploy-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitoidentity-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitoidentity-1.9.16.jar new file mode 100644 index 0000000..483ed74 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitoidentity-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitosync-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitosync-1.9.16.jar new file mode 100644 index 0000000..4dca74b Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-cognitosync-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-config-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-config-1.9.16.jar new file mode 100644 index 0000000..bded1e4 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-config-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.9.16.jar new file mode 100644 index 0000000..5cb578e Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-datapipeline-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-datapipeline-1.9.16.jar new file mode 100644 index 0000000..2c5fd67 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-datapipeline-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-directconnect-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-directconnect-1.9.16.jar new file mode 100644 index 0000000..e6ca0dc Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-directconnect-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-dynamodb-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-dynamodb-1.9.16.jar new file mode 100644 index 0000000..09e2305 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-dynamodb-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ec2-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ec2-1.9.16.jar new file mode 100644 index 0000000..3e64306 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ec2-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ecs-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ecs-1.9.16.jar new file mode 100644 index 0000000..2ec32bc Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ecs-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticache-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticache-1.9.16.jar new file mode 100644 index 0000000..c523649 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticache-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticbeanstalk-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticbeanstalk-1.9.16.jar new file mode 100644 index 0000000..5b880fd Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticbeanstalk-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticloadbalancing-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticloadbalancing-1.9.16.jar new file mode 100644 index 0000000..e9a656e Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elasticloadbalancing-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elastictranscoder-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elastictranscoder-1.9.16.jar new file mode 100644 index 0000000..2e45d36 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-elastictranscoder-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-emr-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-emr-1.9.16.jar new file mode 100644 index 0000000..789c4b1 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-emr-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-glacier-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-glacier-1.9.16.jar new file mode 100644 index 0000000..346cba2 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-glacier-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-iam-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-iam-1.9.16.jar new file mode 100644 index 0000000..76a5462 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-iam-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-importexport-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-importexport-1.9.16.jar new file mode 100644 index 0000000..86a4046 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-importexport-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kinesis-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kinesis-1.9.16.jar new file mode 100644 index 0000000..c96ce35 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kinesis-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kms-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kms-1.9.16.jar new file mode 100644 index 0000000..80ffb62 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-kms-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-lambda-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-lambda-1.9.16.jar new file mode 100644 index 0000000..6462629 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-lambda-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-logs-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-logs-1.9.16.jar new file mode 100644 index 0000000..f8849fb Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-logs-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-opsworks-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-opsworks-1.9.16.jar new file mode 100644 index 0000000..3e6f18b Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-opsworks-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-rds-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-rds-1.9.16.jar new file mode 100644 index 0000000..16131a6 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-rds-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-redshift-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-redshift-1.9.16.jar new file mode 100644 index 0000000..23e927f Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-redshift-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-route53-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-route53-1.9.16.jar new file mode 100644 index 0000000..14c07d8 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-route53-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-s3-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-s3-1.9.16.jar new file mode 100644 index 0000000..614dcbf Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-s3-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ses-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ses-1.9.16.jar new file mode 100644 index 0000000..f29a946 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-ses-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpledb-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpledb-1.9.16.jar new file mode 100644 index 0000000..f161a07 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpledb-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpleworkflow-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpleworkflow-1.9.16.jar new file mode 100644 index 0000000..4ed702c Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-simpleworkflow-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sns-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sns-1.9.16.jar new file mode 100644 index 0000000..56bdcb8 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sns-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sqs-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sqs-1.9.16.jar new file mode 100644 index 0000000..f999a35 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sqs-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-storagegateway-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-storagegateway-1.9.16.jar new file mode 100644 index 0000000..26f4064 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-storagegateway-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sts-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sts-1.9.16.jar new file mode 100644 index 0000000..d599a1c Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-sts-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-support-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-support-1.9.16.jar new file mode 100644 index 0000000..48c7c6c Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-support-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/aws-java-sdk-swf-libraries-1.9.16.jar b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-swf-libraries-1.9.16.jar new file mode 100644 index 0000000..7342dca Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/aws-java-sdk-swf-libraries-1.9.16.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/commons-codec-1.6.jar b/vendor/jar-dependencies/runtime-jars/commons-codec-1.6.jar new file mode 100644 index 0000000..ee1bc49 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/commons-codec-1.6.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/commons-logging-1.1.3.jar b/vendor/jar-dependencies/runtime-jars/commons-logging-1.1.3.jar new file mode 100644 index 0000000..ab51254 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/commons-logging-1.1.3.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/httpclient-4.3.4.jar b/vendor/jar-dependencies/runtime-jars/httpclient-4.3.4.jar new file mode 100644 index 0000000..f8a7afe Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/httpclient-4.3.4.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/httpcore-4.3.2.jar b/vendor/jar-dependencies/runtime-jars/httpcore-4.3.2.jar new file mode 100644 index 0000000..813ec23 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/httpcore-4.3.2.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/jackson-annotations-2.3.0.jar b/vendor/jar-dependencies/runtime-jars/jackson-annotations-2.3.0.jar new file mode 100644 index 0000000..3901f32 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/jackson-annotations-2.3.0.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/jackson-core-2.3.2.jar b/vendor/jar-dependencies/runtime-jars/jackson-core-2.3.2.jar new file mode 100644 index 0000000..0b000af Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/jackson-core-2.3.2.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/jackson-databind-2.3.2.jar b/vendor/jar-dependencies/runtime-jars/jackson-databind-2.3.2.jar new file mode 100644 index 0000000..0449f39 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/jackson-databind-2.3.2.jar differ diff --git a/vendor/jar-dependencies/runtime-jars/joda-time-2.8.1.jar b/vendor/jar-dependencies/runtime-jars/joda-time-2.8.1.jar new file mode 100644 index 0000000..94be659 Binary files /dev/null and b/vendor/jar-dependencies/runtime-jars/joda-time-2.8.1.jar differ