Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Nokogiri version #78

Merged
merged 6 commits into from
Aug 17, 2022
Merged

Updated Nokogiri version #78

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5d426a
Updated Nokogiri version which requires Ruby 2.6.0, so it requires al…
andsel Aug 16, 2022
61e4bca
Added specific matrix test after update of Nokogiri
andsel Aug 16, 2022
c767e35
Forced 8.4.0 in matrix test
andsel Aug 16, 2022
ae21c78
Embedded matrix into the .travis.yml
andsel Aug 17, 2022
5e2bac5
Use jdk17 DOcker env var to open required JDK modules
andsel Aug 17, 2022
26c5fc3
Update CHANGELOG.md
andsel Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
import:
- logstash-plugins/.ci:travis/[email protected]
- logstash-plugins/.ci:travis/[email protected]
- logstash-plugins/.ci:travis/[email protected]

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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 4.1.4
andsel marked this conversation as resolved.
Show resolved Hide resolved
- 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)
Expand Down
5 changes: 3 additions & 2 deletions logstash-filter-xml.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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'
Expand Down