summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-04-27 15:55:08 -0700
committerGitHub <noreply@github.com>2020-04-27 15:55:08 -0700
commitf401b0d052706e257b32c3ba8d49fcdb022e6039 (patch)
tree7a71001af445e8745840d16ed0697bad2c726be5
parentb9044b607af4a09738db65119c40490fcd9f972d (diff)
parente984d5d7de30db05a19e9cebb8e790265d6df91f (diff)
downloadchef-f401b0d052706e257b32c3ba8d49fcdb022e6039.tar.gz
Merge pull request #9744 from chef/remove_rake_ping
Stop pinning rake
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock2
-rw-r--r--omnibus/Gemfile.lock6
3 files changed, 5 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index 511fef221d..010dccc7c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,11 +55,7 @@ group(:ruby_shadow) do
end
group(:development, :test) do
- # we pin rake as a copy of rake is installed from the ruby source
- # if you bump the ruby version you should confirm we don't end up with
- # two rake gems installed again
- gem "rake", "<= 13.0.1"
-
+ gem "rake"
gem "rspec-core", "~> 3.5"
gem "rspec-mocks", "~> 3.5"
gem "rspec-expectations", "~> 3.5"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9617533518..528840900a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -471,7 +471,7 @@ DEPENDENCIES
pry-byebug
pry-remote
pry-stack_explorer
- rake (<= 13.0.1)
+ rake
rb-readline
rspec-core (~> 3.5)
rspec-expectations (~> 3.5)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0ccdb8d154..6d410e6ff7 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.303.0)
+ aws-partitions (1.304.0)
aws-sdk-core (3.94.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -45,12 +45,12 @@ GEM
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.1.2)
+ aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
bcrypt_pbkdf (1.0.1-x86-mingw32)
- berkshelf (7.0.9)
+ berkshelf (7.0.10)
chef (>= 13.6.52)
chef-config
cleanroom (~> 1.0)