Skip to content

Pin jar-dependencies to match jruby 9.4.13.0 #17787

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

Jump to bottom
Merged
merged 2 commits into from
Jul 11, 2025
Merged

Pin jar-dependencies to match jruby 9.4.13.0 #17787

merged 2 commits into from
Jul 11, 2025

Conversation

donoghuc
Copy link
Member

@donoghuc donoghuc commented Jul 9, 2025 •
edited
Loading

Release notes

[rn:skip]

What does this PR do?

When default and bundler dont agree we can see errors about activated versions.

2025-07-09 12:05:26 PDT | org.jruby.exceptions.LoadError: (LoadError) You have already activated jar-dependencies 0.5.4, but your Gemfile requires jar-dependencies 0.5.5. Since jar-dependencies is a default gem, you can either remove your dependency on it or try updating to a newer version of bundler that supports jar-dependencies as a default gem.
-- | --

jruby default https://github.com/jruby/jruby/blob/554704dc3855b27694ebad95b8510418f109cb28/lib/pom.rb#L49

This PR also reverts a patch we were carrying now that jruby ships with a newer jar-dependencies revert

@donoghuc
Pin jar-dependencies to match jruby 9.4.13.0
c82dcf4 
When default and bundler dont agree we can see errors about activated versions.
@github-actions
Copy link
Contributor

github-actions bot commented Jul 9, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Jul 9, 2025

This pull request does not have a backport label. Could you fix it @donoghuc? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • If no backport is necessary, please add the backport-skip label

@donoghuc donoghuc mentioned this pull request Jul 9, 2025
Merged
yaauie
yaauie approved these changes Jul 9, 2025
View reviewed changes
Copy link
Member

@yaauie yaauie left a comment

Choose a reason for hiding this comment

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

caveat: only backport to branches whose yq .jruby.version < /versions.yml provides jar-dependencies = 0.5.4

Gemfile.template Outdated
gem "date", "= 3.3.3"
gem "thwait"
gem "bigdecimal", "~> 3.1"
gem "jar-dependencies", "= 0.5.4" # Pin to avoid conflict with default
Copy link
Member

Choose a reason for hiding this comment

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

🤔 if the jruby we've got provides a jar-dependencies that satisfies the requirement, I'm confused as to how bundler is resolving a different version (but that is neither here nor there)

But it looks like there is a bit of a chicken-and-egg situation with regard to using a non-default jar-dependencies anyway:

because this logic runs during RubyGems boot-up, it's not able to pick up the new jar-dependencies gem

Since version 0.5.4 of jar-dependencies ships with the jruby-9.4.13.0 that we invoke, and includes a fix for jruby/jar-dependencies#92:

  • I think locking it here is net-no-harm.
  • this patch is probably no longer required

Copy link
Member Author

Choose a reason for hiding this comment

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

TLDR:
I recommend (pending seeing tests pass) to revert https://github.com/elastic/logstash/pull/16919/files#diff-799a9c7c14d2dace2d5e32653020eeb792ab3b161e6cd4a734226b87086a6e4aR32-R57 and pinning to 0.5.4 (even though it does not appear to be strictly necessary, i think avoiding needless duplicates is something we should be striving for).

Detailed notes
First off @yaauie, excellent find for that patch! I think i've figured out what is happening...

I was observing the ruby unit tests and x-pack tests failing for the observabilitySRE container forward port https://buildkite.com/elastic/logstash-pull-request-pipeline/builds/3102 . The reason that was happening for the FIPS enabled cells ONLY was that for those tests (ruby unit tests, x-pack, etc) we build a docker image

logstash/x-pack/distributions/internal/observabilitySRE/docker/Dockerfile

Line 46 in a6ce1b0

RUN ./gradlew clean bootstrap assemble installDefaultGems -PfedrampHighMode=true
that runs the installDefaultGems task. This causes jar-dependencies to be installed as a transitive dependency.

When those tests are fun outside the docker image (and therefore without the installDefaultGems) step the ruby env actually runs against a SMALLER SUBSET of the gems actually shipped with logstash.

To illustrate this, compare the Gemfile.locks produced from the different gradle tasks prepared with:

 git checkout upstream/main
 ./gradlew clean
 ./gradlew rubyTests
 cp Gemfile.lock Gemfile.lock.rubyTests
 ./gradlew clean bootstrap assemble installDefaultGems
 cp Gemfile.lock Gemfile.lock.installDefaultGems
 diff Gemfile.lock.rubyTests Gemfile.lock.installDefaultGems

See below for the diff, but the TLDR is that we run the ruby tests against a MUCH smaller set of gems that do not actually represent the entire set shipped with LS packages.

It turns out the pr to update rbenv to use jruby 9.4.13.0 was a total red herring. In fact, I am working on a proposal to stop doing any exogenous jruby installs for logstash runners. INSTEAD we have uncovered an inconsistency whereby we are not running the ruby tests against a representative gem env shipped in packages.

➜  logstash git:(ddd519cc89) ✗ diff Gemfile.lock.rubyTests Gemfile.lock.installDefaultGems
39a40,78
>     atomic (1.1.101-java)
>     avl_tree (1.2.1)
>       atomic (~> 1.1)
>     avro (1.10.2)
>       multi_json (~> 1)
>     aws-eventstream (1.4.0)
>     aws-partitions (1.1126.0)
>     aws-sdk-cloudfront (1.119.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-cloudwatch (1.116.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-core (3.226.2)
>       aws-eventstream (~> 1, >= 1.3.0)
>       aws-partitions (~> 1, >= 1.992.0)
>       aws-sigv4 (~> 1.9)
>       base64
>       jmespath (~> 1, >= 1.6.1)
>       logger
>     aws-sdk-kms (1.106.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-resourcegroups (1.83.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-s3 (1.192.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sdk-kms (~> 1)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-sns (1.100.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sdk-sqs (1.96.0)
>       aws-sdk-core (~> 3, >= 3.225.0)
>       aws-sigv4 (~> 1.5)
>     aws-sigv4 (1.12.1)
>       aws-eventstream (~> 1, >= 1.0.2)
>     back_pressure (1.0.0)
45a85,86
>     bindata (2.5.1)
>     buftok (0.2.0)
60a102
>     dalli (3.2.8)
63a106
>     domain_name (0.6.20240107)
67a111
>     edn (1.1.1)
75a120,122
>     equalizer (0.0.11)
>     et-orbi (1.2.11)
>       tzinfo
94a142,145
>     fugit (1.11.1)
>       et-orbi (~> 1, >= 1.2.11)
>       raabro (~> 1.4)
>     gelfd2 (0.4.1)
96a148,149
>     gene_pool (1.5.0)
>       concurrent-ruby (>= 1.0)
97a151,160
>     hitimes (1.3.1-java)
>     http (3.3.0)
>       addressable (~> 2.3)
>       http-cookie (~> 1.0)
>       http-form_data (~> 2.0)
>       http_parser.rb (~> 0.6.0)
>     http-cookie (1.0.8)
>       domain_name (~> 0.5)
>     http-form_data (2.3.0)
>     http_parser.rb (0.6.0-java)
100a164
>     jar-dependencies (0.5.5)
102a167,169
>     jls-lumberjack (0.0.26)
>       concurrent-ruby
>     jmespath (1.6.2)
103a171,173
>     jruby-jms (1.3.0-java)
>       gene_pool
>       semantic_logger
113a184,225
>     logstash-codec-avro (3.4.1-java)
>       avro (~> 1.10.2)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-codec-cef (6.2.8-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>     logstash-codec-collectd (3.1.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-codec-dots (3.0.6)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-codec-edn (3.1.0)
>       edn
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-codec-edn_lines (3.1.0)
>       edn
>       logstash-codec-line
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-codec-es_bulk (3.1.0)
>       logstash-codec-line
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-codec-fluent (3.4.3-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       msgpack (~> 1.1)
>     logstash-codec-graphite (3.0.6)
>       logstash-codec-line
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
127a240,244
>     logstash-codec-msgpack (3.1.0-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       msgpack (~> 1.1)
134a252,255
>     logstash-codec-netflow (4.3.2)
>       bindata (>= 1.5.0)
>       logstash-core-plugin-api (~> 2.0)
>       logstash-mixin-event_support (~> 1.0)
152a274,280
>     logstash-filter-aggregate (2.10.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-anonymize (3.0.7)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       murmurhash3 (= 0.1.6)
>     logstash-filter-cidr (3.1.3-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
155a284,287
>     logstash-filter-csv (3.1.1)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-validator_support (~> 1.0)
157a290,297
>     logstash-filter-de_dot (1.1.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-dissect (1.2.5)
>       jar-dependencies
>       logstash-core-plugin-api (>= 2.1.1, <= 2.99)
>     logstash-filter-dns (3.2.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       lru_redux (~> 1.1.0)
158a299,304
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-elastic_integration (9.1.0-java)
>       logstash-core (>= 8.7.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-elasticsearch (4.2.0)
>       elasticsearch (>= 7.14.9, < 9)
159a306,313
>       logstash-mixin-ca_trusted_fingerprint_support (~> 1.0)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-validator_support (~> 1.0)
>       manticore (>= 0.7.1)
>     logstash-filter-fingerprint (3.4.4)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       murmurhash3 (= 0.1.6)
163a318,329
>     logstash-filter-grok (4.4.3)
>       jls-grok (~> 0.11.3)
>       logstash-core (>= 5.6.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.0)
>       logstash-patterns-core (>= 4.3.0, < 5)
>       stud (~> 0.0.22)
>     logstash-filter-http (2.0.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       logstash-mixin-http_client (>= 7.5.0, < 8.0.0)
>       logstash-mixin-validator_support (~> 1.0)
167a334,344
>     logstash-filter-kv (4.7.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-filter-memcached (1.2.0)
>       dalli (~> 3)
>       logstash-core-plugin-api (~> 2.0)
>     logstash-filter-metrics (4.0.7)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       metriks
>       thread_safe
169a347,348
>     logstash-filter-prune (3.0.4)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
171a351,377
>     logstash-filter-sleep (3.0.7)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-split (3.1.8)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-syslog_pri (3.2.1)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>     logstash-filter-throttle (4.0.4)
>       atomic
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       thread_safe
>     logstash-filter-translate (3.4.2)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-deprecation_logger_support (~> 1.0)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       logstash-mixin-scheduler (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       psych (>= 5.1.0)
>     logstash-filter-truncate (1.0.6)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-urldecode (3.0.6)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-filter-useragent (3.3.5-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>     logstash-filter-uuid (3.0.5)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
176a383,387
>     logstash-input-azure_event_hubs (1.5.1)
>       logstash-codec-json
>       logstash-codec-plain
>       logstash-core-plugin-api (~> 2.0)
>       stud (>= 0.0.22)
185a397,446
>     logstash-input-couchdb_changes (3.1.6)
>       json
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       stud (>= 0.0.22)
>     logstash-input-dead_letter_queue (2.0.1)
>       logstash-codec-plain
>       logstash-core (>= 8.4.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-input-elastic_serverless_forwarder (2.0.0-java)
>       logstash-codec-json_lines
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-input-http (>= 3.7.2)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       logstash-mixin-normalize_config_support (~> 1.0)
>       logstash-mixin-plugin_factory_support
>     logstash-input-elasticsearch (5.2.0)
>       elasticsearch (>= 7.17.9, < 9)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ca_trusted_fingerprint_support (~> 1.0)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-normalize_config_support (~> 1.0)
>       logstash-mixin-scheduler (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       manticore (>= 0.7.1)
>       tzinfo
>       tzinfo-data
>     logstash-input-exec (3.6.0)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-scheduler (~> 1.0)
>       stud (~> 0.0.22)
>     logstash-input-file (4.4.6)
>       addressable
>       concurrent-ruby (~> 1.0)
>       logstash-codec-multiline (~> 3.0)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>     logstash-input-ganglia (3.1.4)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       stud (~> 0.0.22)
>     logstash-input-gelf (3.3.2)
>       gelfd2 (= 0.4.1)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       stud (>= 0.0.22, < 0.1.0)
186a448,483
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>     logstash-input-graphite (3.0.6)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-input-tcp
>     logstash-input-heartbeat (3.1.1)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-deprecation_logger_support (~> 1.0)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       logstash-mixin-event_support (~> 1.0)
>       stud
>     logstash-input-http (4.1.2-java)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       logstash-mixin-normalize_config_support (~> 1.0)
>     logstash-input-http_poller (6.0.0)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0, >= 1.0.1)
>       logstash-mixin-http_client (>= 7.5.0, < 8.0.0)
>       logstash-mixin-scheduler (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>     logstash-input-jms (3.3.0-java)
>       jruby-jms (>= 1.2.0)
>       logstash-codec-json (~> 3.0)
>       logstash-codec-plain (~> 3.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       semantic_logger (< 4.0.0)
>     logstash-input-pipe (3.1.0)
189a487,491
>       stud (~> 0.0.22)
>     logstash-input-redis (3.7.1)
>       logstash-codec-json
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       redis (>= 4.0.1, < 5)
194a497,504
>     logstash-input-syslog (3.7.1)
>       concurrent-ruby
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-filter-date
>       logstash-filter-grok (>= 4.4.1)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       stud (>= 0.0.22, < 0.1.0)
204a515,590
>     logstash-input-twitter (4.1.1)
>       http-form_data (~> 2)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       public_suffix (> 4, < 6)
>       stud (>= 0.0.22, < 0.1)
>       twitter (= 6.2.0)
>     logstash-input-udp (3.5.0)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.2)
>       stud (~> 0.0.22)
>     logstash-input-unix (3.1.2)
>       logstash-codec-line
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>     logstash-integration-aws (7.2.1-java)
>       aws-sdk-cloudfront
>       aws-sdk-cloudwatch
>       aws-sdk-core (~> 3)
>       aws-sdk-resourcegroups
>       aws-sdk-s3
>       aws-sdk-sns
>       aws-sdk-sqs
>       concurrent-ruby
>       logstash-codec-json
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 2.1.12, <= 2.99)
>       rexml
>       rufus-scheduler (>= 3.0.9)
>       stud (~> 0.0.22)
>     logstash-integration-jdbc (5.6.0)
>       logstash-codec-plain
>       logstash-core (>= 6.5.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-scheduler (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
>       lru_redux
>       sequel (>= 5.74.0)
>       tzinfo
>       tzinfo-data
>     logstash-integration-kafka (11.6.3-java)
>       logstash-codec-json
>       logstash-codec-plain
>       logstash-core (>= 8.3.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-deprecation_logger_support (~> 1.0)
>       manticore (>= 0.5.4, < 1.0.0)
>       stud (>= 0.0.22, < 0.1.0)
>     logstash-integration-logstash (1.0.4-java)
>       logstash-codec-json_lines (~> 3.1)
>       logstash-core-plugin-api (>= 2.1.12, <= 2.99)
>       logstash-input-http (>= 3.7.0)
>       logstash-mixin-http_client (~> 7.3)
>       logstash-mixin-plugin_factory_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.1)
>       stud
>     logstash-integration-rabbitmq (7.4.0-java)
>       back_pressure (~> 1.0)
>       logstash-codec-json
>       logstash-core (>= 6.5.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       march_hare (~> 4.0)
>       stud (~> 0.0.22)
>     logstash-integration-snmp (4.0.6-java)
>       logstash-codec-plain
>       logstash-core (>= 6.5.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-ecs_compatibility_support (~> 1.3)
>       logstash-mixin-event_support (~> 1.0)
>       logstash-mixin-normalize_config_support (~> 1.0)
>       logstash-mixin-validator_support (~> 1.0)
212a599,603
>     logstash-mixin-http_client (7.5.0)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-normalize_config_support (~> 1.0)
>       manticore (>= 0.8.0, < 1.0.0)
216a608,610
>     logstash-mixin-scheduler (1.0.1-java)
>       logstash-core (>= 7.16)
>       rufus-scheduler (>= 3.0.9)
218a613,615
>     logstash-output-csv (3.0.10)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-output-file
226a624,627
>     logstash-output-email (4.1.3)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       mail (~> 2.8)
>       mustache (>= 0.99.8)
230a632,643
>     logstash-output-graphite (3.1.6)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-output-http (6.0.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       logstash-mixin-http_client (>= 7.5.0, < 8.0.0)
>     logstash-output-lumberjack (3.1.9)
>       jls-lumberjack (>= 0.0.26)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       stud
>     logstash-output-nagios (3.0.6)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
233a647,654
>     logstash-output-pipe (3.0.6)
>       logstash-codec-plain
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-output-redis (5.2.0)
>       logstash-core (>= 6.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       redis (~> 4)
>       stud
236a658,669
>     logstash-output-tcp (7.0.1)
>       jruby-openssl (>= 0.12.2)
>       logstash-codec-json
>       logstash-core (>= 8.1.0)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       stud
>     logstash-output-udp (3.2.0)
>       logstash-codec-json
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>     logstash-output-webhdfs (3.1.0-java)
>       logstash-core-plugin-api (>= 1.60, <= 2.99)
>       webhdfs
238a672,677
>     lru_redux (1.1.0)
>     mail (2.8.1)
>       mini_mime (>= 0.1.1)
>       net-imap
>       net-pop
>       net-smtp
240a680,682
>     march_hare (4.7.0-java)
>     memoizable (0.4.2)
>       thread_safe (~> 0.3, >= 0.3.1)
241a684,688
>     metriks (0.9.9.8)
>       atomic (~> 1.0)
>       avl_tree (~> 1.2.0)
>       hitimes (~> 1.1)
>     mini_mime (1.1.5)
242a690
>     msgpack (1.8.0-java)
243a692
>     multipart-post (2.4.1)
247a697
>     naught (1.1.0)
249a700,708
>     net-imap (0.5.9)
>       date
>       net-protocol
>     net-pop (0.1.2)
>       net-protocol
>     net-protocol (0.2.2)
>       timeout
>     net-smtp (0.5.1)
>       net-protocol
274c733,736
<     public_suffix (6.0.2)
---
>     psych (5.2.6-java)
>       date
>       jar-dependencies (>= 0.1.7)
>     public_suffix (5.1.1)
276a739
>     raabro (1.4.0)
289a753
>     redis (4.8.1)
296,297d759
<     rspec-collection_matchers (1.2.1)
<       rspec-expectations (>= 2.99.0.beta1)
324a787,788
>     rufus-scheduler (3.9.2)
>       fugit (~> 1.1, >= 1.11.1)
327a792,796
>     semantic_logger (3.4.1)
>       concurrent-ruby (~> 1.0)
>     sequel (5.94.0)
>       bigdecimal
>     simple_oauth (0.3.1)
350a820
>     timeout (0.4.3)
352a823,833
>     twitter (6.2.0)
>       addressable (~> 2.3)
>       buftok (~> 0.2.0)
>       equalizer (~> 0.0.11)
>       http (~> 3.0)
>       http-form_data (~> 2.0)
>       http_parser.rb (~> 0.6.0)
>       memoizable (~> 0.4.0)
>       multipart-post (~> 2.0)
>       naught (~> 1.0)
>       simple_oauth (~> 0.3.0)
360a842,843
>     webhdfs (0.11.0)
>       addressable
365d847
<     webrick (1.9.1)
376d857
<   cabin (~> 0.6)
380d860
<   elasticsearch
382c862
<   flores
---
>   flores (~> 0.0.8)
385a866,880
>   logstash-codec-avro
>   logstash-codec-cef
>   logstash-codec-collectd
>   logstash-codec-dots
>   logstash-codec-edn
>   logstash-codec-edn_lines
>   logstash-codec-es_bulk
>   logstash-codec-fluent
>   logstash-codec-graphite
>   logstash-codec-json
>   logstash-codec-json_lines
>   logstash-codec-line
>   logstash-codec-msgpack
>   logstash-codec-multiline
>   logstash-codec-netflow
386a882
>   logstash-codec-rubydebug
389c885,888
<   logstash-devutils
---
>   logstash-devutils (~> 2.6.0)
>   logstash-filter-aggregate
>   logstash-filter-anonymize
>   logstash-filter-cidr
390a890
>   logstash-filter-csv
391a892,894
>   logstash-filter-de_dot
>   logstash-filter-dissect
>   logstash-filter-dns
392a896,898
>   logstash-filter-elastic_integration
>   logstash-filter-elasticsearch
>   logstash-filter-fingerprint
393a900,901
>   logstash-filter-grok
>   logstash-filter-http
394a903,905
>   logstash-filter-kv
>   logstash-filter-memcached
>   logstash-filter-metrics
395a907
>   logstash-filter-prune
396a909,917
>   logstash-filter-sleep
>   logstash-filter-split
>   logstash-filter-syslog_pri
>   logstash-filter-throttle
>   logstash-filter-translate
>   logstash-filter-truncate
>   logstash-filter-urldecode
>   logstash-filter-useragent
>   logstash-filter-uuid
397a919
>   logstash-input-azure_event_hubs
398a921,928
>   logstash-input-couchdb_changes
>   logstash-input-dead_letter_queue
>   logstash-input-elastic_serverless_forwarder
>   logstash-input-elasticsearch
>   logstash-input-exec
>   logstash-input-file
>   logstash-input-ganglia
>   logstash-input-gelf
399a930,936
>   logstash-input-graphite
>   logstash-input-heartbeat
>   logstash-input-http
>   logstash-input-http_poller
>   logstash-input-jms
>   logstash-input-pipe
>   logstash-input-redis
400a938
>   logstash-input-syslog
401a940,949
>   logstash-input-twitter
>   logstash-input-udp
>   logstash-input-unix
>   logstash-integration-aws
>   logstash-integration-jdbc
>   logstash-integration-kafka
>   logstash-integration-logstash
>   logstash-integration-rabbitmq
>   logstash-integration-snmp
>   logstash-output-csv
402a951
>   logstash-output-email
403a953,956
>   logstash-output-graphite
>   logstash-output-http
>   logstash-output-lumberjack
>   logstash-output-nagios
404a958,959
>   logstash-output-pipe
>   logstash-output-redis
405a961,963
>   logstash-output-tcp
>   logstash-output-udp
>   logstash-output-webhdfs
415d972
<   rspec-collection_matchers
425,426c982
<   webmock
<   webrick
---
>   webmock (~> 3)

Copy link
Member

Choose a reason for hiding this comment

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

TLDR:
I recommend (pending seeing tests pass) to revert https://github.com/elastic/logstash/pull/16919/files#diff-799a9c7c14d2dace2d5e32653020eeb792ab3b161e6cd4a734226b87086a6e4aR32-R57 and pinning to 0.5.4 (even though it does not appear to be strictly necessary, i think avoiding needless duplicates is something we should be striving for).

I agree.

@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@donoghuc donoghuc marked this pull request as ready for review July 10, 2025 22:47
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

@donoghuc
Copy link
Member Author

Kicked off an exhaustive test build https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/2092

@donoghuc donoghuc mentioned this pull request Jul 10, 2025
Merged
@donoghuc
Copy link
Member Author

Exhaustive tests are green. Planning to merge by EOD unless there are any objections.

@yaauie
Copy link
Member

yaauie commented Jul 11, 2025

No objections from me.

@donoghuc donoghuc merged commit 95866a9 into elastic:main Jul 11, 2025
12 checks passed
@donoghuc
Copy link
Member Author

@Mergifyio backport 9.1

@mergify
Copy link
Contributor

mergify bot commented Jul 11, 2025 •
edited
Loading

backport 9.1

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 11, 2025
@donoghuc @mergify
Pin jar-dependencies to match jruby 9.4.13.0 (#17787)
ed3ff55 
* 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 (#16919)"

This reverts commit 52b7fb0.

(cherry picked from commit 95866a9)

# Conflicts:
#	Gemfile.template
@mergify mergify bot mentioned this pull request Jul 11, 2025
Merged
donoghuc added a commit that referenced this pull request Jul 14, 2025
@mergify @donoghuc
[9.1] (backport #17787) Pin jar-dependencies to match jruby 9.4.13.0 (#…
bc6d52d 
…17809)

* Pin jar-dependencies to match jruby 9.4.13.0 (#17787)

* 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 (#16919)"

This reverts commit 52b7fb0.

(cherry picked from commit 95866a9)

# Conflicts:
#	Gemfile.template

* Resolve merge conflict

Keep both the jar-dependencies AND CGI pins

---------

Co-authored-by: Cas Donoghue <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yaauie yaauie yaauie approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@donoghuc @elasticmachine @yaauie