From e8139571b743d4574ef842e1f76bdab8f65f989d Mon Sep 17 00:00:00 2001
From: "Balasankar \"Balu\" C" <balasankar@gitlab.com>
Date: Tue, 23 Jul 2024 09:46:17 +0530
Subject: [PATCH] Lock logger version to 1.5.x series
Changelog: changed
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
---
Gemfile | 3 +++
Gemfile.checksum | 2 +-
Gemfile.lock | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
index 0213bc0af89fc..245a52e1b3067 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,6 +61,9 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday', '~> 2', feature_category: :shared
gem 'faraday-retry', '~> 2', feature_category: :shared
+# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
+gem 'logger', '~> 1.5.3' # rubocop:todo Gemfile/MissingFeatureCategory
+
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Authorization
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 10a8b5d6d187c..17a4905b40aad 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -359,7 +359,7 @@
{"name":"llhttp-ffi","version":"0.4.0","platform":"ruby","checksum":"e5f7327db3cf8007e648342ef76347d6e0ae545a8402e519cca9c886eb37b001"},
{"name":"locale","version":"2.1.3","platform":"ruby","checksum":"b6ddee011e157817cb98e521b3ce7cb626424d5882f1e844aafdee3e8b212725"},
{"name":"lockbox","version":"1.3.0","platform":"ruby","checksum":"ca8e5806e4e0c56d1d762ac5cf401940ff53fc37554ef623d3313c7a6331a3ea"},
-{"name":"logger","version":"1.6.0","platform":"ruby","checksum":"0ab7c120262dd8de2a18cb8d377f1f318cbe98535160a508af9e7710ff43ef3e"},
+{"name":"logger","version":"1.5.3","platform":"ruby","checksum":"ed443128c2c9254db1a3573c53708b00319c01022b40dcce60a873911831d67b"},
{"name":"lograge","version":"0.11.2","platform":"ruby","checksum":"4cbd1554b86f545d795eff15a0c24fd25057d2ac4e1caa5fc186168b3da932ef"},
{"name":"loofah","version":"2.22.0","platform":"ruby","checksum":"10d76e070c86b12fec74b6a9515fd1940f4459198b991342d0a7897d86c372fe"},
{"name":"lookbook","version":"2.3.2","platform":"ruby","checksum":"abcdefeb13d9150ab30ab8022a2f459db85cbd02e90a0e8e066b32f9048e160a"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 450f742bff214..6a4e00167a9d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1062,7 +1062,7 @@ GEM
rake (~> 13.0)
locale (2.1.3)
lockbox (1.3.0)
- logger (1.6.0)
+ logger (1.5.3)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
@@ -2106,6 +2106,7 @@ DEPENDENCIES
licensee (~> 9.16)
listen (~> 3.7)
lockbox (~> 1.3.0)
+ logger (~> 1.5.3)
lograge (~> 0.5)
loofah (~> 2.22.0)
lookbook (~> 2.3)
--
GitLab