Merge pull request #3490 from mlibrary/HELIO-4486/restrict_redlock

HELIO-4486 follow-up: keep redlock < 2.0
mlibrary · Jul 12, 2023 · 2a5ab1d · 2a5ab1d
2 parents f0ccbd0 + e8ee003
commit 2a5ab1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -168,6 +168,9 @@ gem 'prawn', '~> 2.2'
 gem 'redcarpet', '~> 3.5.1'
 gem 'reverse_markdown'
 
+# see HELIO-4484 and https://github.com/samvera/hyrax/pull/5961
+gem 'redlock', '>= 0.1.2', '< 2.0'
+
 gem 'resque', '~> 2.4.0'
 gem 'resque-pool'
 gem 'resque-web', '~> 0.0.12', require: 'resque_web'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -864,12 +864,10 @@ GEM
     redic (1.5.3)
       hiredis
     redis (4.8.1)
-    redis-client (0.14.1)
-      connection_pool
     redis-namespace (1.11.0)
       redis (>= 4)
-    redlock (2.0.2)
-      redis-client (~> 0.14.1)
+    redlock (1.3.2)
+      redis (>= 3.0.0, < 6.0)
     reform (2.5.0)
       disposable (>= 0.4.2, < 0.5.0)
       representable (>= 2.4.0, < 3.1.0)
@@ -1246,6 +1244,7 @@ DEPENDENCIES
   rails-controller-testing
   rails-html-sanitizer (~> 1.4.4)
   redcarpet (~> 3.5.1)
+  redlock (>= 0.1.2, < 2.0)
   resque (~> 2.4.0)
   resque-pool
   resque-web (~> 0.0.12)