summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Higgins <pete@peterhiggins.org>2020-07-01 16:14:27 -0700
committerPete Higgins <pete@peterhiggins.org>2020-07-01 16:14:57 -0700
commit4236f1411ee39acc9dfd8ae405d0021ba211f593 (patch)
treec266388b4ed3f053ffe02afd70c075062912338c
parent93cb2accdb53a48981527c576d44604ffaee8f64 (diff)
downloadchef-4236f1411ee39acc9dfd8ae405d0021ba211f593.tar.gz
Bump diff-lcs to 1.4.4.bump-diff-lcs
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
-rw-r--r--Gemfile.lock8
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock2
3 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bbd4aa854a..1083be28a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 6a5391298d6fa2f2c2e8fa9a09c31f33a1497ae0
+ revision: 8028951abb141fef97a9b2ddc5e2120f63fbc16a
branch: master
specs:
ohai (16.2.3)
@@ -36,7 +36,7 @@ PATH
chef-utils (= 16.2.74)
chef-vault
chef-zero (>= 14.0.11)
- diff-lcs (>= 1.2.4, < 1.4.0)
+ diff-lcs (~> 1.4.4)
ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (>= 1.9.25)
@@ -70,7 +70,7 @@ PATH
chef-utils (= 16.2.74)
chef-vault
chef-zero (>= 14.0.11)
- diff-lcs (>= 1.2.4, < 1.4.0)
+ diff-lcs (~> 1.4.4)
ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (>= 1.9.25)
@@ -166,7 +166,7 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
- diff-lcs (1.3)
+ diff-lcs (1.4.4)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
diff --git a/chef.gemspec b/chef.gemspec
index 42b7e16522..e3eb38073b 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
s.add_dependency "tty-screen", "~> 0.6" # knife list
s.add_dependency "pastel" # knife ui.color
s.add_dependency "erubis", "~> 2.7"
- s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output
+ s.add_dependency "diff-lcs", "~> 1.4.4" # 1.4.1 - 1.4.3 breaks output
s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3"
s.add_dependency "chef-zero", ">= 14.0.11"
s.add_dependency "chef-vault"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 696331c372..efd1be59c1 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -164,7 +164,7 @@ GEM
citrus (3.0.2)
cleanroom (1.0.0)
concurrent-ruby (1.1.6)
- diff-lcs (1.4.3)
+ diff-lcs (1.4.4)
ed25519 (1.2.4)
equatable (0.6.1)
erubi (1.9.0)