Relax dep on diff-lcs now that 1.4.0 regression is fixed

This unblocks all the cucumber deps in test-kitchen

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 16 insertions, 16 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 9188fd5f4d..77e4dba0b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ PATH
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.4.0)
+      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
       ffi (>= 1.5.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
@@ -76,7 +76,7 @@ PATH
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.4.0)
+      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
       ffi (>= 1.5.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
@@ -190,7 +190,7 @@ GEM
     crack (0.4.5)
       rexml
     debug_inspector (1.1.0)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     ed25519 (1.3.0)
     erubi (1.10.0)
     erubis (2.7.0)
diff --git a/chef.gemspec b/chef.gemspec
index 8b36cef57a..84857f3fb8 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" # remote_file resource
   s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check
-  s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output. Used in lib/chef/util/diff
+  s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff
   s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource
   s.add_dependency "chef-zero", ">= 14.0.11"
   s.add_dependency "chef-vault" # chef-vault resources and helpers
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b1818e1565..f18603fef8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -46,7 +46,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.55.0)
+    aws-sdk-secretsmanager (1.56.0)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
@@ -68,12 +68,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (17.9.26)
+    chef (17.9.42)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.9.26)
-      chef-utils (= 17.9.26)
+      chef-config (= 17.9.42)
+      chef-utils (= 17.9.42)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -99,12 +99,12 @@ GEM
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.9.26-universal-mingw32)
+    chef (17.9.42-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.9.26)
-      chef-utils (= 17.9.26)
+      chef-config (= 17.9.42)
+      chef-utils (= 17.9.42)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -142,9 +142,9 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.4)
-    chef-config (17.9.26)
+    chef-config (17.9.42)
       addressable
-      chef-utils (= 17.9.26)
+      chef-utils (= 17.9.42)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -152,7 +152,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.9.26)
+    chef-utils (17.9.42)
       concurrent-ruby
     chef-vault (4.1.5)
     chef-zero (15.0.11)
@@ -322,7 +322,7 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -330,7 +330,7 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)