Skip to content

Update rexml #17441

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

Draft
wants to merge 2 commits into
base: 7.17
Choose a base branch
from
+4 −4
Draft

Update rexml #17441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59eb521
Update rexml
andsel Mar 28, 2025
8ed951d
Adding filtering of erb template comment line in lib/pluginmanager/se…
andsel Mar 28, 2025
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
4 changes: 2 additions & 2 deletions Gemfile.jruby-2.5.lock.release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ GEM
rake (12.3.3)
rchardet (1.8.0)
redis (4.6.0)
rexml (3.2.6)
rexml (3.4.1)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
Expand Down Expand Up @@ -901,7 +901,7 @@ DEPENDENCIES
pleaserun (~> 0.0.28)
rack-test
rake (~> 12)
rexml (= 3.2.6)
rexml (= 3.4.1)
rspec (~> 3.5)
ruby-progressbar (~> 1)
rubyzip (~> 1)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem "stud", "~> 0.0.22", :group => :build
gem "belzebuth", :group => :development
gem "benchmark-ips", :group => :development
gem "ci_reporter_rspec", "~> 1", :group => :development
gem "rexml", "3.2.6", :group => :development
gem "rexml", "3.4.1", :group => :development
gem "flores", "~> 0.0.8", :group => :development
gem "json-schema", "~> 2", :group => :development
gem "logstash-devutils", "~> 1", :group => :development
Expand Down
2 changes: 1 addition & 1 deletion lib/pluginmanager/proxy_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def configure_proxy
if !proxies.empty?
FileUtils.mkdir_p(SETTINGS_TARGET)
target = ::File.join(SETTINGS_TARGET, "settings.xml")
template = ::File.read(SETTINGS_TEMPLATE)
template = ::File.read(SETTINGS_TEMPLATE).gsub(/(^#.*$)/, '') # removes comment lines starting with #
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer

With new rexml version, the comment lines are not anymore accepted in erb file. The alternative to this change, is replicate what was done on main, remove the comment header section in file lib/pluginmanager/settings.xml.erb https://github.com/elastic/logstash/blob/7.17/lib/pluginmanager/settings.xml.erb#L1-L16

template_content = ERB.new(template, 3).result(ProxyTemplateData.new(proxies).get_binding)

if ::File.exist?(target)
Expand Down