Skip to content

Commit

Permalink
bump lock file for 8.16 (#16726)
Browse files Browse the repository at this point in the history

Also update license checker with new logger dependency (#16695) (#16700)

A new transative dependency on the `logger` gem has been added through sinatra 4.1.0. Update the
license checker to ensure this is accounted for.

(cherry picked from commit e0ed994)

Co-authored-by: Cas Donoghue <[email protected]>

---------

Co-authored-by: logstashmachine <[email protected]>
Co-authored-by: João Duarte <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Cas Donoghue <[email protected]>
  • Loading branch information
4 people authored Nov 26, 2024
1 parent 0beea5a commit eeec9e0
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
13 changes: 8 additions & 5 deletions Gemfile.jruby-3.1.lock.release
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ GEM
jruby-jms (1.3.0-java)
gene_pool
semantic_logger
jruby-openssl (0.15.1-java)
jruby-openssl (0.15.2-java)
jruby-stdin-channel (0.2.0-java)
json (2.7.6-java)
json-schema (2.8.1)
Expand All @@ -204,6 +204,7 @@ GEM
kramdown (2.4.0)
rexml
language_server-protocol (3.17.0.3)
logger (1.6.1)
logstash-codec-avro (3.4.1-java)
avro (~> 1.10.2)
logstash-core-plugin-api (>= 1.60, <= 2.99)
Expand Down Expand Up @@ -589,7 +590,7 @@ GEM
sequel (>= 5.74.0)
tzinfo
tzinfo-data
logstash-integration-kafka (11.5.2-java)
logstash-integration-kafka (11.5.3-java)
logstash-codec-json
logstash-codec-plain
logstash-core (>= 8.3.0)
Expand Down Expand Up @@ -769,8 +770,9 @@ GEM
raabro (1.4.0)
racc (1.8.1-java)
rack (3.1.8)
rack-protection (4.0.0)
rack-protection (4.1.1)
base64 (>= 0.1.0)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-session (2.0.0)
rack (>= 3.0.0)
Expand Down Expand Up @@ -831,10 +833,11 @@ GEM
json
simplecov
simplecov_json_formatter (0.1.4)
sinatra (4.0.0)
sinatra (4.1.1)
logger (>= 1.6.0)
mustermann (~> 3.0)
rack (>= 3.0.0, < 4)
rack-protection (= 4.0.0)
rack-protection (= 4.1.1)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
spoon (0.0.6)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"jruby-stdin-channel:","https://github.com/colinsurprenant/jruby-stdin-channel",Apache-2.0
"jwt:",https://github.com/jwt/ruby-jwt,MIT
"json:",http://json-jruby.rubyforge.org/,Ruby
"logger:",https://github.com/ruby/logger,BSD-2-Clause
"lru_redux:","https://github.com/SamSaffron/lru_redux/",MIT
"mail:","https://github.com/mikel/mail/",MIT
"manticore:","https://github.com/cheald/manticore/",MIT
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

0 comments on commit eeec9e0

Please sign in to comment.