Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-3.1.lock.release
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PATH
i18n (~> 1)
jar-dependencies (= 0.4.1)
jrjackson (= 0.4.20)
jruby-openssl (~> 0.15.4)
jruby-openssl (~> 0.16.0)
manticore (~> 0.6)
minitar (~> 1)
pry (~> 0.12)
Expand Down Expand Up @@ -178,7 +178,7 @@ GEM
jruby-jms (1.3.0-java)
gene_pool
semantic_logger
jruby-openssl (0.15.7-java)
jruby-openssl (0.16.0-java)
jruby-stdin-channel (0.2.0-java)
json (2.12.2-java)
json-schema (2.8.1)
Expand Down
2 changes: 1 addition & 1 deletion logstash-core/logstash-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency 'puma', '~> 6.3', '>= 6.4.2'
gem.add_runtime_dependency 'ruby-maven-libs', '~> 3', '>= 3.8.9'
gem.add_runtime_dependency "jar-dependencies",'= 0.4.1' # Pin to `0.4.1` until https://github.com/jruby/jruby/issues/7262 is resolved
gem.add_runtime_dependency "jruby-openssl", "~> 0.15.4" # Pin until upgrade to jruby 9.4.12.0 https://github.com/elastic/logstash/issues/17007
gem.add_runtime_dependency "jruby-openssl", "~> 0.16.0"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'm struggling to find why this pin was necssary. #17650 i suppose it would be best to delete this line all together if I cant spot it.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Suggested change
gem.add_runtime_dependency "jruby-openssl", "~> 0.16.0"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'm not sure why this was added. PR and exhaustive tests pass. I think removal (to match upstream) is appropriate. LMK if there is something i've missed.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I"m going to do this in a follow up PR as I want to get this in for FF today and i want to vet this more.


gem.add_runtime_dependency "treetop", "~> 1" #(MIT license)

Expand Down
Loading