Skip to content

Commit d98c05f

Browse files
github-actions[bot]logstashmachinemashhurs
authored
bump lock file for 8.18 (#17344)
* Update patch plugin versions in gemfile lock * Rollback the lscl grammar changes caused by bump lock. * Put back es-output criteria which was accidentally removed. --------- Co-authored-by: logstashmachine <[email protected]> Co-authored-by: Mashhur <[email protected]>
1 parent 59bec6e commit d98c05f

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

Gemfile.jruby-3.1.lock.release

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ GEM
4444
atomic (~> 1.1)
4545
avro (1.10.2)
4646
multi_json (~> 1)
47-
aws-eventstream (1.3.1)
47+
aws-eventstream (1.3.2)
4848
aws-partitions (1.1052.0)
4949
aws-sdk-cloudfront (1.112.0)
5050
aws-sdk-core (~> 3, >= 3.216.0)
@@ -177,7 +177,7 @@ GEM
177177
semantic_logger
178178
jruby-openssl (0.15.3-java)
179179
jruby-stdin-channel (0.2.0-java)
180-
json (2.10.1-java)
180+
json (2.10.2-java)
181181
json-schema (2.8.1)
182182
addressable (>= 2.4)
183183
jwt (2.10.1)
@@ -306,8 +306,8 @@ GEM
306306
logstash-filter-elastic_integration (8.17.1-java)
307307
logstash-core (>= 8.7.0)
308308
logstash-core-plugin-api (>= 1.60, <= 2.99)
309-
logstash-filter-elasticsearch (3.17.0)
310-
elasticsearch (>= 7.14.9)
309+
logstash-filter-elasticsearch (3.17.1)
310+
elasticsearch (>= 7.14.9, < 9)
311311
logstash-core-plugin-api (>= 1.60, <= 2.99)
312312
logstash-mixin-ca_trusted_fingerprint_support (~> 1.0)
313313
logstash-mixin-normalize_config_support (~> 1.0)
@@ -416,8 +416,8 @@ GEM
416416
logstash-mixin-ecs_compatibility_support (~> 1.2)
417417
logstash-mixin-normalize_config_support (~> 1.0)
418418
logstash-mixin-plugin_factory_support
419-
logstash-input-elasticsearch (4.21.1)
420-
elasticsearch (>= 7.17.9)
419+
logstash-input-elasticsearch (4.21.2)
420+
elasticsearch (>= 7.17.9, < 9)
421421
logstash-core-plugin-api (>= 1.60, <= 2.99)
422422
logstash-mixin-ca_trusted_fingerprint_support (~> 1.0)
423423
logstash-mixin-ecs_compatibility_support (~> 1.3)
@@ -500,7 +500,7 @@ GEM
500500
logstash-codec-line
501501
logstash-core-plugin-api (>= 1.60, <= 2.99)
502502
logstash-mixin-ecs_compatibility_support (~> 1.2)
503-
logstash-input-syslog (3.7.0)
503+
logstash-input-syslog (3.7.1)
504504
concurrent-ruby
505505
logstash-codec-plain
506506
logstash-core-plugin-api (>= 1.60, <= 2.99)
@@ -558,7 +558,7 @@ GEM
558558
logstash-core-plugin-api (~> 2.0)
559559
logstash-mixin-deprecation_logger_support (~> 1.0)
560560
manticore (~> 0.8)
561-
logstash-integration-jdbc (5.5.2)
561+
logstash-integration-jdbc (5.5.3)
562562
logstash-codec-plain
563563
logstash-core (>= 6.5.0)
564564
logstash-core-plugin-api (>= 1.60, <= 2.99)
@@ -721,7 +721,7 @@ GEM
721721
net-smtp (0.5.1)
722722
net-protocol
723723
nio4r (2.7.4-java)
724-
nokogiri (1.18.3-java)
724+
nokogiri (1.18.4-java)
725725
racc (~> 1.4)
726726
octokit (4.25.1)
727727
faraday (>= 1, < 3)
@@ -752,7 +752,7 @@ GEM
752752
nio4r (~> 2.0)
753753
raabro (1.4.0)
754754
racc (1.8.1-java)
755-
rack (3.1.11)
755+
rack (3.1.12)
756756
rack-protection (4.1.1)
757757
base64 (>= 0.1.0)
758758
logger (>= 1.6.0)
@@ -793,7 +793,7 @@ GEM
793793
rubocop-ast (>= 1.38.0, < 2.0)
794794
ruby-progressbar (~> 1.7)
795795
unicode-display_width (>= 2.4.0, < 4.0)
796-
rubocop-ast (1.38.0)
796+
rubocop-ast (1.38.1)
797797
parser (>= 3.3.1.0)
798798
ruby-maven-libs (3.9.9)
799799
ruby-progressbar (1.13.0)
@@ -854,7 +854,7 @@ GEM
854854
uri (1.0.3)
855855
webhdfs (0.11.0)
856856
addressable
857-
webmock (3.25.0)
857+
webmock (3.25.1)
858858
addressable (>= 2.8.0)
859859
crack (>= 0.3.2)
860860
hashdiff (>= 0.4.0, < 2.0.0)

Gemfile.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gem "paquet", "~> 0.2"
99
gem "pleaserun", "~>0.0.28", require: false
1010
gem "rake", "~> 13", require: false
1111
gem "ruby-progressbar", "~> 1", require: false
12+
gem "logstash-output-elasticsearch", ">= 11.14.0"
1213
gem "ruby-maven-libs", "~> 3", ">= 3.9.6.1"
1314
gem "polyglot", require: false
1415
gem "treetop", require: false

logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3610,10 +3610,8 @@ def _nt_selector_element
36103610

36113611
r0
36123612
end
3613-
36143613
end
36153614

36163615
class LogStashCompilerLSCLGrammarParser < Treetop::Runtime::CompiledParser
36173616
include LogStashCompilerLSCLGrammar
36183617
end
3619-

0 commit comments

Comments
 (0)