diff --git a/.travis.yml b/.travis.yml index a50fc73..54a0a14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,9 @@ import: -- logstash-plugins/.ci:travis/travis.yml@1.x \ No newline at end of file + - logstash-plugins/.ci:travis/defaults.yml@1.x + - logstash-plugins/.ci:travis/exec.yml@1.x + +env: + jobs: + # lock on version 8.x because use Ruby 2.6.0 available from 8.4.0 + - ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env + - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a730d1..1730584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.2.0 + - Update Nokogiri dependency version [#78](https://github.com/logstash-plugins/logstash-filter-xml/pull/78) + ## 4.1.3 - [DOC] Updated URL for current xsl reference docs [#70](https://github.com/logstash-plugins/logstash-filter-xml/pull/70) - [DOC] Added info about non valid characters [#72](https://github.com/logstash-plugins/logstash-filter-xml/pull/72) diff --git a/logstash-filter-xml.gemspec b/logstash-filter-xml.gemspec index f860aa8..1ff7a1f 100644 --- a/logstash-filter-xml.gemspec +++ b/logstash-filter-xml.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-filter-xml' - s.version = '4.1.3' + s.version = '4.2.0' s.licenses = ['Apache License (2.0)'] s.summary = "Parses XML into fields" s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program" @@ -20,8 +20,9 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" } # Gem dependencies + s.add_runtime_dependency 'logstash-core', '>= 8.4.0' # this provides Ruby 2.6.0 s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99" - s.add_runtime_dependency 'nokogiri' + s.add_runtime_dependency 'nokogiri', '>= 1.13.8' # >= 1.13.0 requires Ruby 2.6+ s.add_runtime_dependency 'xml-simple' s.add_development_dependency 'logstash-devutils'