diff --git a/chef-cli.gemspec b/chef-cli.gemspec index 35a36fe6..f6e470b0 100644 --- a/chef-cli.gemspec +++ b/chef-cli.gemspec @@ -47,7 +47,7 @@ Gem::Specification.new do |gem| gem.add_dependency "solve", "< 5.0", "> 2.0" gem.add_dependency "addressable", ">= 2.3.5", "< 2.9" gem.add_dependency "cookbook-omnifetch", "~> 0.5" - gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output + gem.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3" gem.add_dependency "chef-licensing", "~> 1.0" diff --git a/spec/unit/policyfile/differ_spec.rb b/spec/unit/policyfile/differ_spec.rb index ea91eced..f0c913e1 100644 --- a/spec/unit/policyfile/differ_spec.rb +++ b/spec/unit/policyfile/differ_spec.rb @@ -318,7 +318,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -369,7 +369,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -428,7 +428,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -501,7 +501,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -511,7 +511,7 @@ def output bluepill -------- - @@ -1 +1,12 @@ + @@ -1,11 +1,22 @@ +{ + "version": "2.3.2", + "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd", @@ -563,7 +563,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -616,7 +616,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5 @@ -662,7 +662,7 @@ def output REVISION ID CHANGED =================== - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5