From 36a63427176739ffc7d847afd47da4f66d532c9e Mon Sep 17 00:00:00 2001 From: logstashmachine <43502315+logstashmachine@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:04:51 +0000 Subject: [PATCH 1/6] Update patch plugin versions in gemfile lock --- Gemfile.jruby-2.5.lock.release | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile.jruby-2.5.lock.release b/Gemfile.jruby-2.5.lock.release index 81c7dfa0226..243137d99cb 100644 --- a/Gemfile.jruby-2.5.lock.release +++ b/Gemfile.jruby-2.5.lock.release @@ -122,7 +122,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -155,7 +155,7 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.6.0-java) @@ -474,7 +474,7 @@ GEM logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-ecs_compatibility_support (~> 1.3) stud (~> 0.0.22) - logstash-input-redis (3.7.0) + logstash-input-redis (3.7.1) logstash-codec-json logstash-core-plugin-api (>= 1.60, <= 2.99) redis (>= 4.0.1, < 5) @@ -716,7 +716,8 @@ GEM rake (12.3.3) rchardet (1.8.0) redis (4.6.0) - rexml (3.2.6) + rexml (3.2.9) + strscan rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) From cc0752c874213865587dc961b9de29b1dd73d09f Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Tue, 3 Sep 2024 16:41:22 +0100 Subject: [PATCH 2/6] add strscan license note --- .../main/resources/notices/strscan-NOTICE.txt | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt diff --git a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt new file mode 100644 index 00000000000..0654471e84a --- /dev/null +++ b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt @@ -0,0 +1,56 @@ +StringScanner is copyrighted free software by Minero Aoki. +You can redistribute it and/or modify it under either the terms of the +2-clause BSDL (see the file LICENSE.txt), or the conditions below: + +1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + +2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a. place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. + + b. use the modified software only within your corporation or + organization. + + c. give non-standard binaries non-standard names, with + instructions on where to get the original software distribution. + + d. make other distribution arrangements with the author. + +3. You may distribute the software in object code or binary form, + provided that you do at least ONE of the following: + + a. distribute the binaries and library files of the software, + together with instructions (in the manual page or equivalent) + on where to get the original distribution. + + b. accompany the distribution with the machine-readable source of + the software. + + c. give non-standard binaries non-standard names, with + instructions on where to get the original software distribution. + + d. make other distribution arrangements with the author. + +4. You may modify and include the part of the software into any other + software (possibly commercial). But some files in the distribution + are not written by the author, so that they are not under these terms. + + For the list of those files and their copying conditions, see the + file LEGAL. + +5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + +6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. \ No newline at end of file From 7f4f423ef591d77aaff264b6dac142993a046d1f Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Tue, 3 Sep 2024 16:58:22 +0100 Subject: [PATCH 3/6] update strscan license --- .../main/resources/notices/strscan-NOTICE.txt | 78 ++++++------------- 1 file changed, 22 insertions(+), 56 deletions(-) diff --git a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt index 0654471e84a..a8c3e503f17 100644 --- a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt +++ b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt @@ -1,56 +1,22 @@ -StringScanner is copyrighted free software by Minero Aoki. -You can redistribute it and/or modify it under either the terms of the -2-clause BSDL (see the file LICENSE.txt), or the conditions below: - -1. You may make and give away verbatim copies of the source form of the - software without restriction, provided that you duplicate all of the - original copyright notices and associated disclaimers. - -2. You may modify your copy of the software in any way, provided that - you do at least ONE of the following: - - a. place your modifications in the Public Domain or otherwise - make them Freely Available, such as by posting said - modifications to Usenet or an equivalent medium, or by allowing - the author to include your modifications in the software. - - b. use the modified software only within your corporation or - organization. - - c. give non-standard binaries non-standard names, with - instructions on where to get the original software distribution. - - d. make other distribution arrangements with the author. - -3. You may distribute the software in object code or binary form, - provided that you do at least ONE of the following: - - a. distribute the binaries and library files of the software, - together with instructions (in the manual page or equivalent) - on where to get the original distribution. - - b. accompany the distribution with the machine-readable source of - the software. - - c. give non-standard binaries non-standard names, with - instructions on where to get the original software distribution. - - d. make other distribution arrangements with the author. - -4. You may modify and include the part of the software into any other - software (possibly commercial). But some files in the distribution - are not written by the author, so that they are not under these terms. - - For the list of those files and their copying conditions, see the - file LEGAL. - -5. The scripts and library files supplied as input to or produced as - output from the software do not automatically fall under the - copyright of the software, but belong to whomever generated them, - and may be sold commercially, and may be aggregated with this - software. - -6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. \ No newline at end of file +Copyright (C) 1999-2006 Minero Aoki. 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. \ No newline at end of file From 583a26e84110a8ce2d2d6287f971b9393d5e106a Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Tue, 3 Sep 2024 17:22:03 +0100 Subject: [PATCH 4/6] add license mapping --- tools/dependencies-report/src/main/resources/licenseMapping.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv index 3263c3a959b..ec32978f4a6 100644 --- a/tools/dependencies-report/src/main/resources/licenseMapping.csv +++ b/tools/dependencies-report/src/main/resources/licenseMapping.csv @@ -163,6 +163,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "snappy:",https://github.com/miyucy/snappy,MIT "snmp:",https://github.com/hallidave/ruby-snmp,MIT "spoon:",https://github.com/headius/spoon,Apache-2.0 +"strscan:",https://github.com/ruby/strscan,BSD-2-Clause "stud:",https://github.com/jordansissel/ruby-stud,Apache-2.0 "thread_safe:",https://github.com/ruby-concurrency/thread_safe,Apache-2.0 "tilt:",https://github.com/rtomayko/tilt,MIT From b369db6ebf88fc748ebc90891a71a902126398db Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Tue, 3 Sep 2024 18:18:44 +0100 Subject: [PATCH 5/6] pin rexml to 3.2.6 --- Gemfile.jruby-2.5.lock.release | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.jruby-2.5.lock.release b/Gemfile.jruby-2.5.lock.release index 243137d99cb..c1e30d2a020 100644 --- a/Gemfile.jruby-2.5.lock.release +++ b/Gemfile.jruby-2.5.lock.release @@ -716,8 +716,7 @@ GEM rake (12.3.3) rchardet (1.8.0) redis (4.6.0) - rexml (3.2.9) - strscan + rexml (3.2.6) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) From af6b49519c4e5df7a594fa9a99708c1cb1234a02 Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Tue, 3 Sep 2024 19:04:43 +0100 Subject: [PATCH 6/6] remove strscan license note --- .../src/main/resources/licenseMapping.csv | 1 - .../main/resources/notices/strscan-NOTICE.txt | 22 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv index ec32978f4a6..3263c3a959b 100644 --- a/tools/dependencies-report/src/main/resources/licenseMapping.csv +++ b/tools/dependencies-report/src/main/resources/licenseMapping.csv @@ -163,7 +163,6 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "snappy:",https://github.com/miyucy/snappy,MIT "snmp:",https://github.com/hallidave/ruby-snmp,MIT "spoon:",https://github.com/headius/spoon,Apache-2.0 -"strscan:",https://github.com/ruby/strscan,BSD-2-Clause "stud:",https://github.com/jordansissel/ruby-stud,Apache-2.0 "thread_safe:",https://github.com/ruby-concurrency/thread_safe,Apache-2.0 "tilt:",https://github.com/rtomayko/tilt,MIT diff --git a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt deleted file mode 100644 index a8c3e503f17..00000000000 --- a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (C) 1999-2006 Minero Aoki. 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. \ No newline at end of file