summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-13 10:34:07 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-13 10:34:07 -0800
commitf3d30668f39a50d193527eafb88349f3cc5d52ad (patch)
tree4f51e23584a2af3c81a781321374969748d87a80
parenteaf5092b73b9f0e21f6d1bc326c643e4978078f1 (diff)
downloadchef-f3d30668f39a50d193527eafb88349f3cc5d52ad.tar.gz
Pin rspec until we can resolve failures with 3.10
3.10 is causing failures in CI. This pins it so we can keep bumping our other deps Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock17
-rw-r--r--omnibus/Gemfile.lock34
3 files changed, 28 insertions, 25 deletions
diff --git a/Gemfile b/Gemfile
index 99e7cf3c6b..f24cf11a04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ end
group(:development, :test) do
gem "rake"
- gem "rspec"
+ gem "rspec", "=3.9.0" # remove pin once https://github.com/chef/chef/issues/10817 is resolved
gem "webmock"
gem "fauxhai-ng" # for chef-utils gem
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 41a85a7594..05c409736e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 0e8bb8b5afea34b57cdbbb3ad5f9fc33140c64f3
+ revision: f4e5b68f35de8a5bdca06a2b2fff5fd8337f611e
branch: master
specs:
- ohai (17.0.6)
+ ohai (17.0.7)
chef-config (>= 12.8, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
@@ -167,15 +167,16 @@ GEM
net-ssh
coderay (1.1.3)
concurrent-ruby (1.1.7)
- crack (0.4.4)
- debug_inspector (0.0.3)
+ crack (0.4.5)
+ rexml
+ debug_inspector (1.0.0)
diff-lcs (1.3)
ed25519 (1.2.4)
erubi (1.10.0)
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
- fauxhai-ng (8.6.0)
+ fauxhai-ng (8.7.0)
net-ssh
ffi (1.13.1)
ffi (1.13.1-x64-mingw32)
@@ -330,7 +331,7 @@ GEM
syslog-logger (1.6.8)
thor (1.0.1)
tomlrb (1.2.9)
- train-core (3.4.4)
+ train-core (3.4.7)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -362,7 +363,7 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
- webmock (3.11.0)
+ webmock (3.11.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -433,7 +434,7 @@ DEPENDENCIES
pry-stack_explorer
rake
rb-readline
- rspec
+ rspec (= 3.9.0)
ruby-prof (< 1.3.0)
ruby-shadow
webmock
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index de668d1de6..4ddf55c6cd 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,13 +32,13 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.415.0)
- aws-sdk-core (3.110.0)
+ aws-partitions (1.416.0)
+ aws-sdk-core (3.111.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.40.0)
+ aws-sdk-kms (1.41.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.87.0)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.9.16)
+ chef (16.9.20)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.16)
- chef-utils (= 16.9.16)
+ chef-config (= 16.9.20)
+ chef-utils (= 16.9.20)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -101,12 +101,12 @@ GEM
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.9.16-universal-mingw32)
+ chef (16.9.20-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.16)
- chef-utils (= 16.9.16)
+ chef-config (= 16.9.20)
+ chef-utils (= 16.9.20)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -150,9 +150,9 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.9.16)
+ chef-config (16.9.20)
addressable
- chef-utils (= 16.9.16)
+ chef-utils (= 16.9.20)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -161,7 +161,7 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- chef-utils (16.9.16)
+ chef-utils (16.9.20)
chef-vault (4.1.0)
chef-zero (15.0.4)
ffi-yajl (~> 2.2)
@@ -178,9 +178,11 @@ GEM
ed25519 (1.2.4)
erubi (1.10.0)
erubis (2.7.0)
- faraday (1.1.0)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
+ faraday-net_http (1.0.1)
ffi (1.14.2)
ffi (1.14.2-x64-mingw32)
ffi (1.14.2-x86-mingw32)
@@ -199,10 +201,10 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.24.28)
+ inspec-core (4.24.32)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
- faraday (>= 0.9.0, < 1.2)
+ faraday (>= 0.9.0, < 1.4)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
@@ -366,7 +368,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.4.4)
+ train-core (3.4.7)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)