diff options
-rw-r--r-- | omnibus/Gemfile.lock | 98 | ||||
-rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
2 files changed, 54 insertions, 46 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index eda597a9ed..0433bbecf6 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/omnibus - revision: 9e1741c2e5925f60822c3192d7c8fc74a6947eeb + revision: 6cfec3a04de67aea335c23b5a3bd334a3a68fafe branch: master specs: - omnibus (6.0.2) - aws-sdk (~> 2) + omnibus (6.0.4) + aws-sdk-s3 (~> 1) chef-sugar (>= 3.3) cleanroom (~> 1.0) ffi-yajl (~> 2.2) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: a2ee7a44bfb67203001e82b893cbab4cd3e33a75 + revision: 3b6ef4c42d8c2f9f9e1c6e285b2ea48e0d0f0fdd branch: master specs: omnibus-software (4.0.0) @@ -31,13 +31,20 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.146) - aws-sdk-resources (= 2.11.146) - aws-sdk-core (2.11.146) + aws-eventstream (1.0.1) + aws-partitions (1.106.0) + aws-sdk-core (3.35.0) + aws-eventstream (~> 1.0) + aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.146) - aws-sdk-core (= 2.11.146) + aws-sdk-kms (1.11.0) + aws-sdk-core (~> 3, >= 3.26.0) + aws-sigv4 (~> 1.0) + aws-sdk-s3 (1.23.0) + aws-sdk-core (~> 3, >= 3.26.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.0) aws-sigv4 (1.0.3) berkshelf (7.0.6) chef (>= 13.6.52) @@ -56,10 +63,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (10.0.2) - chef (14.5.33) + chef (14.6.47) addressable bundler (>= 1.10) - chef-config (= 14.5.33) + chef-config (= 14.6.47) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -67,7 +74,6 @@ GEM ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -79,18 +85,18 @@ GEM ohai (~> 14.0) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.5, < 3.8) - rspec-expectations (~> 3.5, < 3.8) - rspec-mocks (~> 3.5, < 3.8) + rspec-core (~> 3.5) + rspec-expectations (~> 3.5) + rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.5.33-universal-mingw32) + chef (14.6.47-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.5.33) + chef-config (= 14.6.47) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -98,7 +104,7 @@ GEM ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.11.0) + iso8601 (~> 0.12.1) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -110,9 +116,9 @@ GEM ohai (~> 14.0) plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.5, < 3.8) - rspec-expectations (~> 3.5, < 3.8) - rspec-mocks (~> 3.5, < 3.8) + rspec-core (~> 3.5) + rspec-expectations (~> 3.5) + rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) @@ -126,10 +132,10 @@ GEM win32-mutex (~> 0.4.2) win32-process (~> 0.8.2) win32-service (~> 1.0) - win32-taskscheduler (~> 1.0.0) + win32-taskscheduler (~> 2.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (14.5.33) + chef-config (14.6.47) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -169,9 +175,9 @@ GEM iniparse (1.4.4) iostruct (0.0.4) ipaddress (0.8.3) - iso8601 (0.11.0) + iso8601 (0.12.1) jmespath (1.4.0) - kitchen-vagrant (1.3.4) + kitchen-vagrant (1.3.6) test-kitchen (~> 1.4) libyajl2 (1.2.0) license_scout (1.0.16) @@ -183,8 +189,10 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.9.0) - minitar (0.6.1) - mixlib-archive (0.4.16) + minitar (0.7) + mixlib-archive (0.4.18) + mixlib-log + mixlib-archive (0.4.18-universal-mingw32) mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) @@ -215,9 +223,9 @@ GEM net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) nori (2.6.0) - octokit (4.12.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.5.4) + ohai (14.6.2) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -250,22 +258,22 @@ GEM public_suffix (3.0.3) rack (2.0.5) retryable (2.0.4) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) + rspec-support (~> 3.8.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.7.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) @@ -285,7 +293,7 @@ GEM solve (4.0.0) molinillo (~> 0.6) semverse (>= 1.1, < 3.0) - specinfra (2.76.2) + specinfra (2.76.3) net-scp net-ssh (>= 2.7) net-telnet (= 0.1.1) @@ -326,12 +334,12 @@ GEM win32-service (1.0.1) ffi ffi-win32-extensions - win32-taskscheduler (1.0.10) + win32-taskscheduler (2.0.0) ffi structured_warnings windows-api (0.4.4) win32-api (>= 1.4.5) - winrm (2.2.3) + winrm (2.3.0) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -343,7 +351,7 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.0) + winrm-fs (1.3.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) @@ -369,4 +377,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.16.5 + 1.16.6 diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 78301b59b5..4efaa57424 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -68,7 +68,7 @@ if windows? dependency "ruby-windows-devkit-bash" end -dependency "chef-cleanup" +dependency "ruby-cleanup" package :rpm do signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"] |