diff options
| -rw-r--r-- | omnibus/Gemfile | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 82 |
2 files changed, 35 insertions, 53 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 8cdaafa877..ca5e4f2339 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -14,12 +14,6 @@ group :development do # Use Berkshelf for resolving cookbook dependencies gem "berkshelf", ">= 7.0" - # We have to use chef/ohai 16 until all builders are on ruby >= 2.7 - gem "ohai", "~> 16.0" - gem "chef", "~> 16.0" - gem "chef-config", "~> 16.0" - gem "chef-utils", "~> 16.0" - # Use Test Kitchen with Vagrant for converging the build environment gem "test-kitchen", ">= 1.23" gem "kitchen-vagrant", ">= 1.3.1" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cf28e7c6ea..37ae0a0895 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -46,6 +46,9 @@ GEM aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) + aws-sdk-secretsmanager (1.54.0) + aws-sdk-core (~> 3, >= 3.122.0) + aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) @@ -65,21 +68,20 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.17.4) + chef (17.8.25) addressable - bcrypt_pbkdf (~> 1.1) - bundler (>= 1.10) - chef-config (= 16.17.4) - chef-utils (= 16.17.4) + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 17.8.25) + chef-utils (= 17.8.25) chef-vault chef-zero (>= 14.0.11) + corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.4.0) - ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25) + ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 3) iniparse (~> 1.4) inspec-core (~> 4.23) license-acceptance (>= 1.0.5, < 3) @@ -89,34 +91,28 @@ GEM mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) net-sftp (>= 2.1.2, < 4.0) - net-ssh (>= 5.1, < 7) - net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 16.0) - pastel + ohai (~> 17.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) - tty-prompt (~> 0.21) - tty-screen (~> 0.6) - tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) - chef (16.17.4-universal-mingw32) + vault (~> 0.16) + chef (17.8.25-universal-mingw32) addressable - bcrypt_pbkdf (~> 1.1) - bundler (>= 1.10) - chef-config (= 16.17.4) - chef-utils (= 16.17.4) + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 17.8.25) + chef-utils (= 17.8.25) chef-vault chef-zero (>= 14.0.11) + corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.4.0) - ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25) + ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 3) iniparse (~> 1.4) inspec-core (~> 4.23) iso8601 (>= 0.12.1, < 0.14) @@ -127,21 +123,16 @@ GEM mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) net-sftp (>= 2.1.2, < 4.0) - net-ssh (>= 5.1, < 7) - net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 16.0) - pastel + ohai (~> 17.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) - tty-prompt (~> 0.21) - tty-screen (~> 0.6) - tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) + vault (~> 0.16) win32-api (~> 1.5.3) - win32-certstore (~> 0.5.0) + win32-certstore (~> 0.6.2) win32-event (~> 0.6.1) win32-eventlog (= 0.6.3) win32-mmap (~> 0.4.1) @@ -151,9 +142,9 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.4) - chef-config (16.17.4) + chef-config (17.8.25) addressable - chef-utils (= 16.17.4) + chef-utils (= 17.8.25) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -161,8 +152,9 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (16.17.4) - chef-vault (4.1.4) + chef-utils (17.8.25) + concurrent-ruby + chef-vault (4.1.5) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -175,6 +167,8 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.9) contracts (0.16.1) + corefoundation (0.3.4) + ffi (>= 1.15.0) diff-lcs (1.3) ed25519 (1.2.4) erubi (1.10.0) @@ -209,7 +203,6 @@ GEM gyoku (1.3.1) builder (>= 2.1.2) hashie (4.1.0) - highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) inspec-core (4.50.3) @@ -289,16 +282,13 @@ GEM net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) nori (2.6.0) octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.17.0) - chef-config (>= 14.12, < 17) - chef-utils (>= 16.0, < 17) + ohai (17.7.12) + chef-config (>= 14.12, < 18) + chef-utils (>= 16.0, < 18) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -413,9 +403,11 @@ GEM unicode-display_width (2.1.0) unicode_utils (1.4.0) uuidtools (2.2.0) + vault (0.16.0) + aws-sigv4 webrick (1.7.0) win32-api (1.5.3-universal-mingw32) - win32-certstore (0.5.3) + win32-certstore (0.6.2) ffi mixlib-shellout win32-event (0.6.3) @@ -466,11 +458,7 @@ PLATFORMS DEPENDENCIES artifactory berkshelf (>= 7.0) - chef (~> 16.0) - chef-config (~> 16.0) - chef-utils (~> 16.0) kitchen-vagrant (>= 1.3.1) - ohai (~> 16.0) omnibus! omnibus-software! pedump |