Skip to content

Commit

Permalink
bump lock file for 7.17 (#16341)
Browse files Browse the repository at this point in the history
* Update patch plugin versions in gemfile lock
* Force rexml from 3.2.9 back 3.2.6
* Added missed licenses
  • Loading branch information
github-actions[bot] authored Jul 23, 2024
1 parent 2cf0717 commit 5b13f97
Show file tree
Hide file tree
Showing 13 changed files with 479 additions and 13 deletions.
33 changes: 20 additions & 13 deletions Gemfile.jruby-2.5.lock.release
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ PATH
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
amazing_print (1.4.0)
arr-pm (0.0.12)
atomic (1.1.101-java)
Expand All @@ -57,14 +57,16 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
back_pressure (1.0.0)
backports (3.23.0)
base64 (0.2.0)
belzebuth (0.2.3)
childprocess
benchmark-ips (2.10.0)
bigdecimal (3.1.7-java)
bigdecimal (3.1.8-java)
bindata (2.4.15)
buftok (0.2.0)
builder (3.2.4)
cabin (0.9.0)
cgi (0.4.1-java)
childprocess (4.1.0)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
Expand All @@ -90,15 +92,18 @@ GEM
elastic-app-search (7.8.0)
jwt (>= 1.5, < 3.0)
elastic-workplace-search (0.4.1)
elasticsearch (7.17.10)
elasticsearch-api (= 7.17.10)
elasticsearch-transport (= 7.17.10)
elasticsearch-api (7.17.10)
elasticsearch (7.17.11)
elasticsearch-api (= 7.17.11)
elasticsearch-transport (= 7.17.11)
elasticsearch-api (7.17.11)
multi_json
elasticsearch-transport (7.17.10)
elasticsearch-transport (7.17.11)
base64
faraday (>= 1, < 3)
multi_json
equalizer (0.0.11)
erb (2.2.3)
cgi
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -150,7 +155,7 @@ GEM
http-cookie (~> 1.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
http-form_data (2.3.0)
http_parser.rb (0.6.0-java)
Expand Down Expand Up @@ -207,7 +212,7 @@ GEM
logstash-mixin-ecs_compatibility_support (~> 1.3)
logstash-mixin-event_support (~> 1.0)
logstash-mixin-validator_support (~> 1.0)
logstash-codec-fluent (3.4.2-java)
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)
Expand Down Expand Up @@ -365,7 +370,7 @@ GEM
logstash-core-plugin-api (>= 1.60, <= 2.99)
nokogiri
xml-simple
logstash-input-azure_event_hubs (1.4.5)
logstash-input-azure_event_hubs (1.4.7)
logstash-codec-json
logstash-codec-plain
logstash-core-plugin-api (~> 2.0)
Expand Down Expand Up @@ -725,8 +730,8 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.1)
rspec-wait (0.0.9)
rspec (>= 3, < 4)
rspec-wait (0.0.10)
rspec (>= 3.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyzip (1.3.0)
Expand All @@ -750,6 +755,7 @@ GEM
snmp (1.3.2)
spoon (0.0.6)
ffi
strscan (3.1.0-java)
stud (0.0.23)
thread_safe (0.3.6-java)
tilt (2.0.11)
Expand Down Expand Up @@ -791,6 +797,7 @@ DEPENDENCIES
builder (~> 3)
childprocess (~> 4)
ci_reporter_rspec (~> 1)
erb (~> 2)
flores (~> 0.0.8)
fpm (~> 1, >= 1.14.1)
gems (~> 1)
Expand Down
12 changes: 12 additions & 0 deletions tools/dependencies-report/src/main/resources/licenseMapping.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"aws-sdk:",http://github.com/aws/aws-sdk-ruby,Apache-2.0
"aws-sigv4:",http://github.com/aws/aws-sdk-ruby,Apache-2.0
"back_pressure:",https://github.com/yaauie/ruby_back_pressure,Apache-2.0
"base64:",https://github.com/ruby/base64,BSD-2-Clause
"bindata:",http://github.com/dmendel/bindata,BSD-2-Clause
"buftok:",https://github.com/sferik/buftok,MIT
"builder:",http://onestepback.org,MIT
Expand All @@ -36,6 +37,8 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"commons-logging:commons-logging:",http://commons.apache.org/proper/commons-logging/,Apache-2.0
"concurrent-ruby:",http://www.concurrent-ruby.com,MIT
"dalli:",https://github.com/petergoldstein/dalli,MIT
"diff-lcs:",https://github.com/halostatue/diff-lcs,MIT
"digest-crc:",https://github.com/postmodern/digest-crc,MIT
"domain_name:",https://github.com/knu/ruby-domain_name,BSD-2-Clause
"dotenv:",https://github.com/bkeepers/dotenv,MIT
"edn:",https://github.com/relevance/edn-ruby,MIT
Expand Down Expand Up @@ -140,7 +143,15 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz
"redis:",https://github.com/redis/redis-rb,MIT
"rexml:",https://github.com/ruby/rexml,MIT
"rspec:",https://github.com/rspec/rspec-metagem,MIT
"rspec-collection_matchers:",https://github.com/rspec/rspec-collection_matchers,MIT
"rspec-core:",https://github.com/rspec/rspec-core,MIT
"rspec-expectations:",https://github.com/rspec/rspec-expectations,MIT
"rspec-mocks:",https://github.com/rspec/rspec-mocks,MIT
"rspec-support:",https://github.com/rspec/rspec-support,MIT
"rspec-wait:",https://github.com/laserlemon/rspec-wait,MIT
"ruby-progressbar:",https://github.com/jfelchner/ruby-progressbar,MIT
"ruby-kafka:",https://github.com/zendesk/ruby-kafka,Apache-2.0
"ruby2_keywords",https://github.com/ruby/ruby2_keywords,BSD-2-Clause
"rubyzip:",https://github.com/rubyzip/rubyzip,BSD-2-Clause-FreeBSD
"rufus-scheduler:",http://github.com/jmettraux/rufus-scheduler,MIT
Expand All @@ -163,3 +174,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"webhdfs:",https://github.com/kzk/webhdfs,Apache-2.0
"xml-simple:",https://github.com/maik/xml-simple,BSD-2-Clause
"down",https://github.com/janko/down,MIT
"webrick:",https://github.com/ruby/webrick,BSD-2-Clause
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
source: https://github.com/halostatue/diff-lcs/blob/v1.5.1/License.md

== License

This software is available under three licenses: the GNU GPL version 2 (or at
your option, a later version), the Perl Artistic license, or the MIT license.
Note that my preference for licensing is the MIT license, but Algorithm::Diff
was dually originally licensed with the Perl Artistic and the GNU GPL ("the
same terms as Perl itself") and given that the Ruby implementation originally
hewed pretty closely to the Perl version, I must maintain the additional
licensing terms.

* Copyright 2004–2013 Austin Ziegler.
* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
Mario I. Wolczko.

=== MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

=== Perl Artistic License (version 2)
See the file docs/artistic.txt in the main distribution.

=== GNU GPL version 2
See the file docs/COPYING.txt in the main distribution.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Source: https://github.com/postmodern/digest-crc/blob/v0.5.1/LICENSE.txt

Copyright (c) 2010-2020 Hal Brodigan

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
source: https://github.com/rspec/rspec-metagem/blob/v3.11.0/LICENSE.md

The MIT License (MIT)
=====================

Copyright © 2009 Chad Humphries, David Chelimsky
Copyright © 2006 David Chelimsky, The RSpec Development Team
Copyright © 2005 Steven Baker

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the “Software”), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
source: https://github.com/rspec/rspec-core/blob/v3.11.0/LICENSE.md

The MIT License (MIT)
=====================

* Copyright © 2012 Chad Humphries, David Chelimsky, Myron Marston
* Copyright © 2009 Chad Humphries, David Chelimsky
* Copyright © 2006 David Chelimsky, The RSpec Development Team
* Copyright © 2005 Steven Baker

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
source: https://github.com/rspec/rspec-expectations/blob/v3.11.0/LICENSE.md

The MIT License (MIT)
=====================

* Copyright © 2012 David Chelimsky, Myron Marston
* Copyright © 2006 David Chelimsky, The RSpec Development Team
* Copyright © 2005 Steven Baker

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
source: https://github.com/rspec/rspec-mocks/blob/v3.11.2/LICENSE.md

The MIT License (MIT)
=====================

* Copyright © 2012 David Chelimsky, Myron Marston
* Copyright © 2006 David Chelimsky, The RSpec Development Team
* Copyright © 2005 Steven Baker

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
source: https://github.com/rspec/rspec-support/blob/v3.11.1/LICENSE.md

The MIT License (MIT)
====================

* Copyright © 2013 David Chelimsky, Myron Marston, Jon Rowe, Sam Phippen, Xavier Shay, Bradley Schaefer

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading

0 comments on commit 5b13f97

Please sign in to comment.