diff --git a/.travis.yml b/.travis.yml index 2c71181..98e115e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ rvm: - jruby-head jdk: - - openjdk6 - openjdk7 - oraclejdk7 - oraclejdk8 @@ -17,6 +16,3 @@ notifications: matrix: fast_finish: true - exclude: - - rvm: jruby-head - jdk: openjdk6 diff --git a/README.md b/README.md index 41ab1f0..cbc6acf 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,11 @@ output { ``` ### Changelog: +- [v0.1.4](https://github.com/cyli/logstash-output-slack/releases/tag/v0.1.4): + - Drops support for JDK6 ([#15](https://github.com/cyli/logstash-output-slack/pull/15)) + - Fix gemspec requirements to support newer versions of logstash core ([#14](https://github.com/cyli/logstash-output-slack/pull/14)) +- [v0.1.3](https://github.com/cyli/logstash-output-slack/releases/tag/v0.1.3): + - No change - bug in releasing - [v0.1.2](https://github.com/cyli/logstash-output-slack/releases/tag/v0.1.2): - Added support for attachments - [v0.1.1](https://github.com/cyli/logstash-output-slack/releases/tag/v0.1.1): diff --git a/logstash-output-slack.gemspec b/logstash-output-slack.gemspec index b6197f9..4e3704d 100644 --- a/logstash-output-slack.gemspec +++ b/logstash-output-slack.gemspec @@ -20,17 +20,8 @@ Gem::Specification.new do |s| # Gem dependencies - # logstash-core > 2.0.0.snapshot3 requires jrjackson ~> 0.3.5, which requires - # JDK7. - core_upper_bound = "~> 2.0.0.snapshot3" - if RUBY_PLATFORM == 'java' - s.platform = RUBY_PLATFORM - if java.lang.System.get_property('java.version') < "1.7" # JDK6 - core_upper_bound = "<= 2.0.0.snapshot3" - end - end - - s.add_runtime_dependency "logstash-core", core_upper_bound, ">= 1.4.0" + s.platform = "java" + s.add_runtime_dependency "logstash-core", "< 3.0.0", ">= 1.4.0" s.add_runtime_dependency "logstash-codec-plain", "~> 2.0.0", ">= 1.0.0" s.add_runtime_dependency "rest-client", '~> 1.8', ">= 1.8.0" s.add_development_dependency "logstash-devutils", "~> 0.0.16"