summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock10
2 files changed, 7 insertions, 7 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 6fca425e62..71698fcb1f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "no_dev"
gem "artifactory"
gem "pedump"
@@ -18,7 +18,7 @@ group :development do
gem "ohai"
# Use Test Kitchen with Vagrant for converging the build environment
- gem "test-kitchen", ">= 1.23"
+ gem "test-kitchen", ">= 2"
gem "kitchen-vagrant", ">= 1.3.1"
gem "winrm-fs", "~> 1.0"
end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5c7364b84b..843484cfeb 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,8 +18,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 0e0686b82299ca2ddc6b9251319e4309142c4b7d
- branch: master
+ revision: ee2f9f1ee66e8ed9e6e051356c02f5aaf57fa8db
+ branch: no_dev
specs:
omnibus-software (4.0.0)
omnibus (>= 5.6.1)
@@ -41,8 +41,8 @@ GEM
aws-sdk-kms (1.39.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.81.1)
- aws-sdk-core (~> 3, >= 3.104.3)
+ aws-sdk-s3 (1.82.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
@@ -399,7 +399,7 @@ DEPENDENCIES
omnibus!
omnibus-software!
pedump
- test-kitchen (>= 1.23)
+ test-kitchen (>= 2)
winrm-fs (~> 1.0)
BUNDLED WITH