summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock12
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock12
3 files changed, 13 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f812a386d..2f79ce41d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 7bd12469af0ba7227d77124dce4cdf7b9051e331
+ revision: 3c77e1ac8753552818ed2045bc17e6971fb86720
branch: master
specs:
- ohai (16.2.1)
+ ohai (16.2.2)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -36,7 +36,7 @@ PATH
chef-utils (= 16.2.69)
chef-vault
chef-zero (>= 14.0.11)
- diff-lcs (~> 1.2, >= 1.2.4)
+ diff-lcs (>= 1.2.4, < 1.4.0)
ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (>= 1.9.25)
@@ -70,7 +70,7 @@ PATH
chef-utils (= 16.2.69)
chef-vault
chef-zero (>= 14.0.11)
- diff-lcs (~> 1.2, >= 1.2.4)
+ diff-lcs (>= 1.2.4, < 1.4.0)
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.4.2)
+ diff-lcs (1.3)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
@@ -227,7 +227,7 @@ GEM
inspec-core (= 4.21.1)
ipaddress (0.8.3)
iso8601 (0.12.2)
- json (2.3.0)
+ json (2.3.1)
json_schemer (0.2.11)
ecma-re-validator (~> 0.2)
hana (~> 1.3)
diff --git a/chef.gemspec b/chef.gemspec
index b2fc6cf5e3..42b7e16522 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", ">= 1.2.4"
+ s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 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 c37f90dc97..696331c372 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: d75718522deb9faeb3c21b50c60e94daf70ce9b6
+ revision: 320d9350cdf39abdcc4c37d5bc2971b3c222a0a0
branch: master
specs:
- omnibus (7.0.13)
+ omnibus (7.0.14)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.335.0)
+ aws-partitions (1.337.0)
aws-sdk-core (3.102.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.35.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.71.1)
+ aws-sdk-s3 (1.72.0)
aws-sdk-core (~> 3, >= 3.102.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -164,7 +164,7 @@ GEM
citrus (3.0.2)
cleanroom (1.0.0)
concurrent-ruby (1.1.6)
- diff-lcs (1.4.2)
+ diff-lcs (1.4.3)
ed25519 (1.2.4)
equatable (0.6.1)
erubi (1.9.0)
@@ -193,7 +193,7 @@ GEM
ipaddress (0.8.3)
iso8601 (0.12.2)
jmespath (1.4.0)
- json (2.3.0)
+ json (2.3.1)
kitchen-vagrant (1.6.1)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)