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.
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
deps: downgrade jruby, keep updated default-gem dependencies (forward-port #15283) #15369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#15283) forward-ports non-release-branch components of elastic#15283 to `main` * deps: downgrade jruby, keep updated default-gem dependencies By downgrading JRuby to 9.4.2.0 we avoid the silent global crash of the scheduler backing `Concurrent::TimerTask` that occurs when Jruby 9.4.3.0's invokedynamic promotes a method to run natively, incorrectly. Upstream bug: jruby/jruby#7904 Along with the downgrade of JRuby itself to 9.4.2.0, we cherry-pick the updates to gems that were included in the latest JRuby 9.4.3.0 to ensure we don't back out relevant fixes to stdlib. We also remove a pinned-dependency on `racc` that is no longer relevant. Resolves: elastic#15282 * Imported the licenses for some gems - cgi - date - ffi-binary-libfixposix - io-console - net-http - net-protocol - reline - time - timeout - uri * specs: avoid mocking global ::Gem::Dependency::new * build: remove redundanct dependsOn declaration * deps: notice use of ffi-binary-libfixposix via Ruby license this gem is tri-licensed `Ruby` / `EPL-2.0` / `LGPL-2.1-or-later` and the Ruby license is preferred to EPL when available --------- Co-authored-by: andsel <selva.andre@gmail.com>
mashhurs
approved these changes
Oct 3, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
jenkins build this again please |
jenkins test this again please |
SonarQube Quality Gate |
@logstashmachine backport to 8.11 |
@logstashmachine backport 8.11 |
github-actions bot
pushed a commit
that referenced
this pull request
Oct 3, 2023
…-port #15283) (#15369) * deps: downgrade jruby, keep updated default-gem dependencies (#15283) forward-ports non-release-branch components of #15283 to `main` * deps: downgrade jruby, keep updated default-gem dependencies By downgrading JRuby to 9.4.2.0 we avoid the silent global crash of the scheduler backing `Concurrent::TimerTask` that occurs when Jruby 9.4.3.0's invokedynamic promotes a method to run natively, incorrectly. Upstream bug: jruby/jruby#7904 Along with the downgrade of JRuby itself to 9.4.2.0, we cherry-pick the updates to gems that were included in the latest JRuby 9.4.3.0 to ensure we don't back out relevant fixes to stdlib. We also remove a pinned-dependency on `racc` that is no longer relevant. Resolves: #15282 * Imported the licenses for some gems - cgi - date - ffi-binary-libfixposix - io-console - net-http - net-protocol - reline - time - timeout - uri * specs: avoid mocking global ::Gem::Dependency::new * build: remove redundanct dependsOn declaration * deps: notice use of ffi-binary-libfixposix via Ruby license this gem is tri-licensed `Ruby` / `EPL-2.0` / `LGPL-2.1-or-later` and the Ruby license is preferred to EPL when available --------- Co-authored-by: andsel <selva.andre@gmail.com> * deps: add license notices for gems moved from default to bundled --------- Co-authored-by: andsel <selva.andre@gmail.com> (cherry picked from commit 70081bb)
2 tasks
mashhurs
pushed a commit
that referenced
this pull request
Oct 3, 2023
…-port #15283) (#15369) (#15370) * deps: downgrade jruby, keep updated default-gem dependencies (#15283) forward-ports non-release-branch components of #15283 to `main` * deps: downgrade jruby, keep updated default-gem dependencies By downgrading JRuby to 9.4.2.0 we avoid the silent global crash of the scheduler backing `Concurrent::TimerTask` that occurs when Jruby 9.4.3.0's invokedynamic promotes a method to run natively, incorrectly. Upstream bug: jruby/jruby#7904 Along with the downgrade of JRuby itself to 9.4.2.0, we cherry-pick the updates to gems that were included in the latest JRuby 9.4.3.0 to ensure we don't back out relevant fixes to stdlib. We also remove a pinned-dependency on `racc` that is no longer relevant. Resolves: #15282 * Imported the licenses for some gems - cgi - date - ffi-binary-libfixposix - io-console - net-http - net-protocol - reline - time - timeout - uri * specs: avoid mocking global ::Gem::Dependency::new * build: remove redundanct dependsOn declaration * deps: notice use of ffi-binary-libfixposix via Ruby license this gem is tri-licensed `Ruby` / `EPL-2.0` / `LGPL-2.1-or-later` and the Ruby license is preferred to EPL when available --------- Co-authored-by: andsel <selva.andre@gmail.com> * deps: add license notices for gems moved from default to bundled --------- Co-authored-by: andsel <selva.andre@gmail.com> (cherry picked from commit 70081bb) Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
forward-ports non-release-branch components of #15283 to
main
By downgrading JRuby to 9.4.2.0 we avoid the silent global crash of the scheduler backing
Concurrent::TimerTask
that occurs when Jruby 9.4.3.0's invokedynamic promotes a method to run natively, incorrectly.Upstream bug: jruby/jruby#7904
Along with the downgrade of JRuby itself to 9.4.2.0, we cherry-pick the updates to gems that were included in the latest JRuby 9.4.3.0 to ensure we don't back out relevant fixes to stdlib.
We also remove a pinned-dependency on
racc
that is no longer relevant.Resolves: #15282
specs: avoid mocking global ::Gem::Dependency::new
build: remove redundanct dependsOn declaration
deps: notice use of ffi-binary-libfixposix via Ruby license
this gem is tri-licensed
Ruby
/EPL-2.0
/LGPL-2.1-or-later
and the Ruby license is preferred to EPL when availableRelease notes
[rn:skip]: no change from 8.10
What does this PR do?
Forward-ports the pinning of Jruby from 8.10 to
main
; the bugs have been fixed upstream but no released artifact is available yet.Why is it important/What is the impact to the user?
Prevents us from releasing a broken Logstash
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files (and/or docker env variables)[ ] I have added tests that prove my fix is effective or that my feature worksHow to test this PR locally
Same as #15283:
Related issues
#15283