From 2e678527461448ff7dd8b31231594d45918ddede Mon Sep 17 00:00:00 2001
From: Dominic Couture <dcouture@gitlab.com>
Date: Tue, 14 Jan 2025 13:40:48 +0000
Subject: [PATCH] Fix Gemfile version contraint for rexml to 3.4.0
---
Gemfile | 2 +-
Gemfile.checksum | 2 +-
Gemfile.lock | 6 +++---
Gemfile.next.checksum | 2 +-
Gemfile.next.lock | 6 +++---
gems/gitlab-backup-cli/Gemfile.lock | 4 ++--
gems/gitlab-backup-cli/gitlab-backup-cli.gemspec | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Gemfile b/Gemfile
index 0e8209ec0c84..5c7c2ab99fb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access
gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
-gem 'rexml', '~> 3.3.2', feature_category: :shared
+gem 'rexml', '~> 3.4.0', feature_category: :shared
gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access
gem 'omniauth', '~> 2.1.0', feature_category: :system_access
gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 77b6d8684cf6..c984cd6ecd59 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -592,7 +592,7 @@
{"name":"rest-client","version":"2.1.0","platform":"x86-mswin32","checksum":"a35a3bb8d16ca39d110a946a2c805267f98ce07a0ae890e4512a45eadea47a6e"},
{"name":"retriable","version":"3.1.2","platform":"ruby","checksum":"0a5a5d0ca4ba61a76fb31a17ab8f7f80281beb040c329d34dfc137a1398688e0"},
{"name":"reverse_markdown","version":"1.4.0","platform":"ruby","checksum":"a3305da1509ac8388fa84a28745621113e121383402a2e8e9350ba649034e870"},
-{"name":"rexml","version":"3.3.9","platform":"ruby","checksum":"d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9"},
+{"name":"rexml","version":"3.4.0","platform":"ruby","checksum":"efbea1efba7fa151158e0ee1e643525834da2d8eb4cf744aa68f6480bc9804b2"},
{"name":"rinku","version":"2.0.0","platform":"ruby","checksum":"3e695aaf9f24baba3af45823b5c427b58a624582132f18482320e2737f9f8a85"},
{"name":"rotp","version":"6.3.0","platform":"ruby","checksum":"75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854"},
{"name":"rouge","version":"4.4.0","platform":"ruby","checksum":"7a6d6d951e3202e4ce3926838625fa6edeb35680e6d1e3817f53c14212220b64"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 6be8e7dfb410..a9e4604188a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ PATH
pg (~> 1.5.6)
rack (~> 2.2.9)
rainbow (~> 3.0)
- rexml (~> 3.3.2)
+ rexml (~> 3.4.0)
thor (~> 1.3)
PATH
@@ -1592,7 +1592,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
- rexml (3.3.9)
+ rexml (3.4.0)
rinku (2.0.0)
rotp (6.3.0)
rouge (4.4.0)
@@ -2273,7 +2273,7 @@ DEPENDENCIES
request_store (~> 1.5.1)
responders (~> 3.0)
retriable (~> 3.1.2)
- rexml (~> 3.3.2)
+ rexml (~> 3.4.0)
rouge (~> 4.4.0)
rqrcode (~> 2.2)
rspec-benchmark (~> 0.6.0)
diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum
index 6c4860891368..6b3709f1097d 100644
--- a/Gemfile.next.checksum
+++ b/Gemfile.next.checksum
@@ -602,7 +602,7 @@
{"name":"rest-client","version":"2.1.0","platform":"x86-mswin32","checksum":"a35a3bb8d16ca39d110a946a2c805267f98ce07a0ae890e4512a45eadea47a6e"},
{"name":"retriable","version":"3.1.2","platform":"ruby","checksum":"0a5a5d0ca4ba61a76fb31a17ab8f7f80281beb040c329d34dfc137a1398688e0"},
{"name":"reverse_markdown","version":"1.4.0","platform":"ruby","checksum":"a3305da1509ac8388fa84a28745621113e121383402a2e8e9350ba649034e870"},
-{"name":"rexml","version":"3.3.9","platform":"ruby","checksum":"d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9"},
+{"name":"rexml","version":"3.4.0","platform":"ruby","checksum":"efbea1efba7fa151158e0ee1e643525834da2d8eb4cf744aa68f6480bc9804b2"},
{"name":"rinku","version":"2.0.0","platform":"ruby","checksum":"3e695aaf9f24baba3af45823b5c427b58a624582132f18482320e2737f9f8a85"},
{"name":"rotp","version":"6.3.0","platform":"ruby","checksum":"75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854"},
{"name":"rouge","version":"4.4.0","platform":"ruby","checksum":"7a6d6d951e3202e4ce3926838625fa6edeb35680e6d1e3817f53c14212220b64"},
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index cb65a2fcc2ce..ba1f388ee7a0 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -54,7 +54,7 @@ PATH
pg (~> 1.5.6)
rack (~> 2.2.9)
rainbow (~> 3.0)
- rexml (~> 3.3.2)
+ rexml (~> 3.4.0)
thor (~> 1.3)
PATH
@@ -1622,7 +1622,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
- rexml (3.3.9)
+ rexml (3.4.0)
rinku (2.0.0)
rotp (6.3.0)
rouge (4.4.0)
@@ -2306,7 +2306,7 @@ DEPENDENCIES
request_store (~> 1.5.1)
responders (~> 3.0)
retriable (~> 3.1.2)
- rexml (~> 3.3.2)
+ rexml (~> 3.4.0)
rouge (~> 4.4.0)
rqrcode (~> 2.2)
rspec-benchmark (~> 0.6.0)
diff --git a/gems/gitlab-backup-cli/Gemfile.lock b/gems/gitlab-backup-cli/Gemfile.lock
index 7aeae256cc48..ba589fbcf71c 100644
--- a/gems/gitlab-backup-cli/Gemfile.lock
+++ b/gems/gitlab-backup-cli/Gemfile.lock
@@ -27,7 +27,7 @@ PATH
pg (~> 1.5.6)
rack (~> 2.2.9)
rainbow (~> 3.0)
- rexml (~> 3.3.2)
+ rexml (~> 3.4.0)
thor (~> 1.3)
GEM
@@ -136,7 +136,7 @@ GEM
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
- rexml (3.3.9)
+ rexml (3.4.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
diff --git a/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec b/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
index 70f2f708dbd2..77df4d6197b5 100644
--- a/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
+++ b/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "minitest", "~> 5.11.0"
spec.add_dependency "parallel", "~> 1.19"
spec.add_dependency "rack", "~> 2.2.9"
- spec.add_dependency "rexml", "~> 3.3.2"
+ spec.add_dependency "rexml", "~> 3.4.0"
spec.add_development_dependency "factory_bot", "~> 6.4.6"
spec.add_development_dependency "gitlab-styles", "~> 11.0"
--
GitLab