From e5d426aac6647014e05898e719bcac87cb0bc660 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 16 Aug 2022 15:20:31 +0200 Subject: [PATCH 1/6] Updated Nokogiri version which requires Ruby 2.6.0, so it requires also Logstash >= 8.4.0 --- CHANGELOG.md | 3 +++ logstash-filter-xml.gemspec | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a730d1..dc5ac00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.1.4 + - 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' From 61e4bca9e4e3b59809768aec5d1eae3e5d26a5c7 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 16 Aug 2022 18:16:46 +0200 Subject: [PATCH 2/6] Added specific matrix test after update of Nokogiri --- .ci/travis/matrix.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .ci/travis/matrix.yml diff --git a/.ci/travis/matrix.yml b/.ci/travis/matrix.yml new file mode 100644 index 0000000..6f21f9d --- /dev/null +++ b/.ci/travis/matrix.yml @@ -0,0 +1,27 @@ +_performance: &_performance + install: .ci/performance/docker-setup.sh + script: .ci/performance/docker-run.sh + +# Only run performance tests if plugin has them. +# Add to your .travis.yml +# env: +# global: +# - HAS_PERFORMANCE_TESTS=1 + +stages: +- name: Test +- name: Performance + if: env(HAS_PERFORMANCE_TESTS) == "1" + +env: + jobs: + - ELASTIC_STACK_VERSION=8.x + - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x + +jobs: +- stage: Performance + name: Performance Base-Line +- <<: *_performance + env: ELASTIC_STACK_VERSION=8.x +- <<: *_performance + env: SNAPSHOT=true ELASTIC_STACK_VERSION=8.x From c767e35b4f3627de30a5e2156af74c31c9ee22b2 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 16 Aug 2022 18:23:04 +0200 Subject: [PATCH 3/6] Forced 8.4.0 in matrix test --- .ci/travis/matrix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/travis/matrix.yml b/.ci/travis/matrix.yml index 6f21f9d..7c69869 100644 --- a/.ci/travis/matrix.yml +++ b/.ci/travis/matrix.yml @@ -17,6 +17,7 @@ env: jobs: - ELASTIC_STACK_VERSION=8.x - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x + - SNAPSHOT=true ELASTIC_STACK_VERSION=8.4.0-SNAPSHOT jobs: - stage: Performance From ae21c78062a20013efb667915ebc607e0da9f077 Mon Sep 17 00:00:00 2001 From: andsel Date: Wed, 17 Aug 2022 08:53:59 +0200 Subject: [PATCH 4/6] Embedded matrix into the .travis.yml --- .ci/travis/matrix.yml | 28 ---------------------------- .travis.yml | 9 ++++++++- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 .ci/travis/matrix.yml diff --git a/.ci/travis/matrix.yml b/.ci/travis/matrix.yml deleted file mode 100644 index 7c69869..0000000 --- a/.ci/travis/matrix.yml +++ /dev/null @@ -1,28 +0,0 @@ -_performance: &_performance - install: .ci/performance/docker-setup.sh - script: .ci/performance/docker-run.sh - -# Only run performance tests if plugin has them. -# Add to your .travis.yml -# env: -# global: -# - HAS_PERFORMANCE_TESTS=1 - -stages: -- name: Test -- name: Performance - if: env(HAS_PERFORMANCE_TESTS) == "1" - -env: - jobs: - - ELASTIC_STACK_VERSION=8.x - - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x - - SNAPSHOT=true ELASTIC_STACK_VERSION=8.4.0-SNAPSHOT - -jobs: -- stage: Performance - name: Performance Base-Line -- <<: *_performance - env: ELASTIC_STACK_VERSION=8.x -- <<: *_performance - env: SNAPSHOT=true ELASTIC_STACK_VERSION=8.x diff --git a/.travis.yml b/.travis.yml index a50fc73..6f1a72a 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 + - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x \ No newline at end of file From 5e2bac5ff776f55cf245c83fb314011b548f5c10 Mon Sep 17 00:00:00 2001 From: andsel Date: Wed, 17 Aug 2022 09:13:31 +0200 Subject: [PATCH 5/6] Use jdk17 DOcker env var to open required JDK modules --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f1a72a..54a0a14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,5 @@ import: env: jobs: # lock on version 8.x because use Ruby 2.6.0 available from 8.4.0 - - ELASTIC_STACK_VERSION=8.x - - SNAPSHOT=true ELASTIC_STACK_VERSION=8.x \ No newline at end of file + - 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 From 26c5fc3b9d627c80f93b2886bc1b9c0798f75651 Mon Sep 17 00:00:00 2001 From: Andrea Selva Date: Wed, 17 Aug 2022 11:31:18 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Duarte --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc5ac00..1730584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 4.1.4 +## 4.2.0 - Update Nokogiri dependency version [#78](https://github.com/logstash-plugins/logstash-filter-xml/pull/78) ## 4.1.3