From 9be8886d3855d512ac4d6d9ed3053f378406f740 Mon Sep 17 00:00:00 2001 From: Logstash Machine <43502315+logstashmachine@users.noreply.github.com> Date: Tue, 25 Feb 2020 09:21:34 -0800 Subject: [PATCH] Update patch plugin versions in gemfile lock for 6.8.7 (#11626) --- Gemfile.jruby-2.5.lock.release | 26 +++++++++---------- NOTICE.TXT | 2 +- .../src/main/resources/licenseMapping.csv | 2 +- ...-NOTICE.txt => nokogiri-1.10.8-NOTICE.txt} | 0 4 files changed, 15 insertions(+), 15 deletions(-) rename tools/dependencies-report/src/main/resources/notices/{nokogiri-1.10.7-NOTICE.txt => nokogiri-1.10.8-NOTICE.txt} (100%) diff --git a/Gemfile.jruby-2.5.lock.release b/Gemfile.jruby-2.5.lock.release index 10062e91593..2ef8c059ec1 100644 --- a/Gemfile.jruby-2.5.lock.release +++ b/Gemfile.jruby-2.5.lock.release @@ -15,7 +15,7 @@ PATH filesize (= 0.0.4) gems (~> 0.8.3) i18n (= 0.6.9) - jrjackson (= 0.4.10) + jrjackson (= 0.4.11) jruby-openssl (>= 0.9.20) manticore (>= 0.5.4, < 1.0.0) minitar (~> 0.6.1) @@ -124,8 +124,8 @@ GEM jls-lumberjack (0.0.26) concurrent-ruby jmespath (1.4.0) - jrjackson (0.4.10-java) - jruby-openssl (0.10.2-java) + jrjackson (0.4.11-java) + jruby-openssl (0.10.4-java) jruby-stdin-channel (0.2.0-java) json (1.8.6-java) json-schema (2.6.2) @@ -254,7 +254,7 @@ GEM logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-filter-sleep (3.0.6) logstash-core-plugin-api (>= 1.60, <= 2.99) - logstash-filter-split (3.1.7) + logstash-filter-split (3.1.8) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-filter-syslog_pri (3.0.5) logstash-core-plugin-api (>= 1.60, <= 2.99) @@ -304,7 +304,7 @@ GEM logstash-core-plugin-api (>= 1.60, <= 2.99) rufus-scheduler stud (~> 0.0.22) - logstash-input-file (4.1.11) + logstash-input-file (4.1.16) addressable logstash-codec-multiline (~> 3.0) logstash-codec-plain @@ -328,7 +328,7 @@ GEM logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) stud - logstash-input-http (3.3.2-java) + logstash-input-http (3.3.3-java) jar-dependencies (~> 0.3, >= 0.3.4) logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) @@ -433,7 +433,7 @@ GEM logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-aws (>= 1.0.0) rufus-scheduler (~> 3.0.9) - logstash-output-csv (3.0.7) + logstash-output-csv (3.0.8) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-filter-json logstash-input-generator @@ -474,7 +474,7 @@ GEM logstash-output-null (3.0.5) logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) - logstash-output-pagerduty (3.0.8) + logstash-output-pagerduty (3.0.9) logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-output-pipe (3.0.6) @@ -535,7 +535,7 @@ GEM murmurhash3 (0.1.6-java) mustache (0.99.8) naught (1.1.0) - nokogiri (1.10.7-java) + nokogiri (1.10.8-java) numerizer (0.1.1) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) @@ -567,15 +567,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.0) - rspec-support (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-mocks (3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.0) + rspec-support (3.9.2) rspec-wait (0.0.9) rspec (>= 3, < 4) ruby-progressbar (1.8.3) diff --git a/NOTICE.TXT b/NOTICE.TXT index 88b1023c569..c734a60a9b3 100644 --- a/NOTICE.TXT +++ b/NOTICE.TXT @@ -5660,7 +5660,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========== -Notice for: nokogiri-1.10.7 +Notice for: nokogiri-1.10.8 ---------- source: https://github.com/sparklemotion/nokogiri/blob/v1.8.2/LICENSE.md diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv index df9bba6fa47..4dc265be48c 100644 --- a/tools/dependencies-report/src/main/resources/licenseMapping.csv +++ b/tools/dependencies-report/src/main/resources/licenseMapping.csv @@ -110,7 +110,7 @@ dependency,dependencyUrl,licenseOverride "mustache:0.99.8","https://github.com/mustache/mustache",MIT "nailgun","http://martiansoftware.com/nailgun",Apache-2.0 "naught:1.1.0","https://github.com/avdi/naught/",MIT -"nokogiri:1.10.7","http://nokogiri.org/",MIT +"nokogiri:1.10.8","http://nokogiri.org/",MIT "numerizer:0.1.1","https://github.com/jduff/numerizer/",MIT "openssl_pkcs8_pure:0.0.0.2",http://github.com/cielavenir/openssl_pkcs8_pure,Ruby "options",https://github.com/headius/options,Apache-2.0 diff --git a/tools/dependencies-report/src/main/resources/notices/nokogiri-1.10.7-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/nokogiri-1.10.8-NOTICE.txt similarity index 100% rename from tools/dependencies-report/src/main/resources/notices/nokogiri-1.10.7-NOTICE.txt rename to tools/dependencies-report/src/main/resources/notices/nokogiri-1.10.8-NOTICE.txt