Backport bump jruby 9.4.13#19188
Draft
andsel wants to merge 11 commits into
Draft
Conversation
…9183) (elastic#19187) Made with ❤️️ by updatecli (cherry picked from commit 497b995) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Contributor
🤖 GitHub commentsJust comment with:
|
…ic#19190) Update Elasticsearch and Enterprise search plugins to use the 8.19 version of the respective client libraries. Update the Gemfile.lock to use Elastic client libraries version 8.19, and update the Enterprise Search Logstash integration plugin accordingly. Also update license management to include the license for the `ostruct` dependency.
* upgrade jruby to 9.4.11.0 * follow up cleanups * follow up cleanups * follow up cleanups * follow up cleanups * add licenses * Update rakelib/plugins-metadata.json * attempt to fix rubygems * attempt to fix rubygems * attempt to fix rubygems * tweaks for jruby 9.4.12.0 and sha256 validation * attempt at fixing rubygems * attempt at fixing rubygems * attempt at fixing rubygems * attempt at fixing rubygems * Bump jruby to 9.4.12.1 * Explicitly require 'set' to make `to_set` available Something appears to have changed in code loading where this require is no longer in the call chain. Explicitly require it here. * Fix up dependency mapper * Update bundler code with latest rubygems release This commit makes 2 changes: 1. We were sending a `Gem::Platform` instance to Thor parser instead of a string. Convert to string version of a platform name. With newly added checks in Thor, we were getting `noMethodError` for `Gem::Platform`. 2. It looks like there was a patch to get around a bug in bundler that was reaching out to the network for local gems. This appears to have been fixed upstream, this removes the patch. * Restore patch * Remove patch (TODO, link to full writeup) * SPIKE: Take up jruby 9.4.13.0 * Patch bundler cache Still validating this. Essentially ensure we check local gems when calling cache using the updated rubygems class. * WIP: test patch for acceptance tests * Skip when unable to cache * Cache every gem * Fix acceptance test * Force another route through builtin * Fixup idea (it returns nil, not raise) * Fix missing version update * Fix qatest filter plugin Without including a gemspec with a locally built gem logstash-plugin list will not show it in the output. * Use vendored gem instead of reaching out to rubygems We vendor an udpated test gem for local install. Use that instead of reaching out to rubygems. * Document and comment on the patched bundler code * Fix test instead of downloading the "broken" one from rubygems (downloading the `.gem` file directly does show up in plugin-list), using a vendored one polutes the cache. Use a new vendored gem --------- Co-authored-by: João Duarte <jsvduarte@gmail.com> Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
Without this change the Bundler shipped with JRuby 9.4.13 (2.6.3) checks the existing lockfile version (2.3.26), given the mismatching version, Bundler tries to restarts itself but with half backed configuration, not setting a HOME properly and makes failing the `:bootstrap`. ./gradlew bootstrap runs Bundler inside Gradle’s embedded JRuby (jruby-core), not via vendor/jruby/bin/jruby. Because that embedded runtime has no JRuby home set, Gem.ruby points to a non-existent $TMPDIR/bin/jruby, and when Bundler tries to auto-switch to the lockfile’s Bundler version (2.3.26 vs 2.6.3), it fails with Errno::ENOENT trying to exec that path.
* Pin jar-dependencies to match jruby 9.4.13.0 When default and bundler dont agree we can see errors about activated versions. * Revert "fix jars installer for new maven and pin psych to 5.2.2 (elastic#16919)" This reverts commit 52b7fb0.
…regenerated NOTICES.TXT
andsel
force-pushed
the
backport_bump_jruby_9.4.13
branch
from
79fdc60 to
116e076
Compare
Member
Author
|
run exhaustive tests |
…' which exists starting from v9
💚 Build Succeeded
History
cc @andsel |
Member
Author
|
run exhaustive tests |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Release notes
What does this PR do?
Backports #17787 and #17696 to bundle JRuby
9.4.13to Logstahs8.19branch, fixing conflicts.Why is it important/What is the impact to the user?
Checklist
Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs