Merge remote-tracking branch 'origin/feature/plugin-api-2_0'

.travis.yml

@@ -1,21 +1,24 @@
+---
 sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - jruby-19mode
+- jruby-1.7.25
 before_install:
-  - curl -s -o kafka.tgz http://ftp.wayne.edu/apache/kafka/0.9.0.1/kafka_2.11-0.9.0.1.tgz
-  - mkdir kafka && tar xzf kafka.tgz -C kafka --strip-components 1
-  - kafka/bin/zookeeper-server-start.sh kafka/config/zookeeper.properties &
-  - kafka/bin/kafka-server-start.sh kafka/config/server.properties &
-  - sleep 3
-  - kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic topic1 --zookeeper localhost:2181
-  - kafka/bin/kafka-topics.sh --create --partitions 2 --replication-factor 1 --topic topic2 --zookeeper localhost:2181
-  - kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic gzip_topic --zookeeper localhost:2181
-  - kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic snappy_topic --zookeeper localhost:2181
-  - kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic lz4_topic --zookeeper localhost:2181
-  - kafka/bin/kafka-topics.sh --create --partitions 3 --replication-factor 1 --topic topic3 --zookeeper localhost:2181
+- curl -s -o kafka.tgz http://ftp.wayne.edu/apache/kafka/0.9.0.1/kafka_2.11-0.9.0.1.tgz
+- mkdir kafka && tar xzf kafka.tgz -C kafka --strip-components 1
+- kafka/bin/zookeeper-server-start.sh kafka/config/zookeeper.properties &
+- kafka/bin/kafka-server-start.sh kafka/config/server.properties &
+- sleep 3
+- kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic topic1 --zookeeper localhost:2181
+- kafka/bin/kafka-topics.sh --create --partitions 2 --replication-factor 1 --topic topic2 --zookeeper localhost:2181
+- kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic gzip_topic --zookeeper localhost:2181
+- kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic snappy_topic --zookeeper localhost:2181
+- kafka/bin/kafka-topics.sh --create --partitions 1 --replication-factor 1 --topic lz4_topic --zookeeper localhost:2181
+- kafka/bin/kafka-topics.sh --create --partitions 3 --replication-factor 1 --topic topic3 --zookeeper localhost:2181
+- git clone -b feature/event_interface https://github.com/elastic/logstash
 before_script:
-  - bundle exec rake vendor
-  - bundle exec rake install_jars
+- bundle exec rake vendor
+- bundle exec rake install_jars
 script: bundle exec rspec && bundle exec rspec --tag integration
+jdk: oraclejdk8

Gemfile

@@ -1,2 +1,8 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+gem "logstash-core", :path => "./logstash/logstash-core"
+gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
+gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
+gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"
+gem "logstash-codec-plain", :github => "logstash-plugins/logstash-codec-plain", :branch => "feature/plugin-api-2_0"
+gem "logstash-codec-json", :github => "logstash-plugins/logstash-codec-json", :branch => "feature/plugin-api-2_0"

logstash-output-kafka.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jar-dependencies', '~> 0.3.2'
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'logstash-codec-json'