diff --git a/Gemfile.lock b/Gemfile.lock index 72c0aabd0..a3a19dbfd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,13 +30,13 @@ GEM mixlib-shellout (~> 2.0) artifactory (2.8.2) ast (2.4.0) - aws-sdk (2.11.147) - aws-sdk-resources (= 2.11.147) - aws-sdk-core (2.11.147) + aws-sdk (2.11.149) + aws-sdk-resources (= 2.11.149) + aws-sdk-core (2.11.149) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.147) - aws-sdk-core (= 2.11.147) + aws-sdk-resources (2.11.149) + aws-sdk-core (= 2.11.149) aws-sigv4 (1.0.3) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -384,7 +384,7 @@ GEM http-form_data (1.0.3) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.1.0) + i18n (1.1.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inifile (3.0.0) @@ -548,7 +548,7 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - octokit (4.12.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) ohai (14.6.2) chef-config (>= 12.8, < 15) @@ -775,7 +775,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) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 14583b3b4..d0bbbc336 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 67a458d2e8a55b267fe0b47f6e1ec9c01e097137 + revision: a2ee7a44bfb67203001e82b893cbab4cd3e33a75 branch: master specs: omnibus-software (4.0.0) @@ -9,11 +9,11 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: 386cd17f6a6365bd4585761a2738b4561fbaea97 + revision: 6cfec3a04de67aea335c23b5a3bd334a3a68fafe branch: master specs: - omnibus (6.0.1) - aws-sdk (~> 2) + omnibus (6.0.4) + aws-sdk-s3 (~> 1) chef-sugar (>= 3.3) cleanroom (~> 1.0) ffi-yajl (~> 2.2) @@ -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.144) - aws-sdk-resources (= 2.11.144) - aws-sdk-core (2.11.144) + aws-eventstream (1.0.1) + aws-partitions (1.105.0) + aws-sdk-core (3.30.0) + aws-eventstream (~> 1.0) + aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.144) - aws-sdk-core (= 2.11.144) + aws-sdk-kms (1.9.0) + aws-sdk-core (~> 3, >= 3.26.0) + aws-sigv4 (~> 1.0) + aws-sdk-s3 (1.21.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) @@ -84,6 +91,48 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) + chef (14.5.33-universal-mingw32) + addressable + bundler (>= 1.10) + chef-config (= 14.5.33) + chef-zero (>= 13.0) + diff-lcs (~> 1.2, >= 1.2.4) + erubis (~> 2.7) + ffi (~> 1.9, >= 1.9.25) + 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) + mixlib-log (~> 2.0, >= 2.0.3) + mixlib-shellout (~> 2.4) + net-sftp (~> 2.1, >= 2.1.2) + net-ssh (~> 4.2) + net-ssh-multi (~> 1.2, >= 1.2.1) + 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_junit_formatter (~> 0.2.0) + serverspec (~> 2.7) + specinfra (~> 2.10) + syslog-logger (~> 1.6) + uuidtools (~> 2.1.5) + win32-api (~> 1.5.3) + win32-dir (~> 0.5.0) + win32-event (~> 0.6.1) + win32-eventlog (= 0.6.3) + win32-mmap (~> 0.4.1) + win32-mutex (~> 0.4.2) + win32-process (~> 0.8.2) + win32-service (~> 1.0) + win32-taskscheduler (~> 1.0.0) + windows-api (~> 0.4.4) + wmi-lite (~> 1.0) chef-config (14.5.33) addressable fuzzyurl @@ -105,6 +154,10 @@ GEM faraday (0.15.3) multipart-post (>= 1.2, < 3) ffi (1.9.25) + ffi (1.9.25-x64-mingw32) + ffi (1.9.25-x86-mingw32) + ffi-win32-extensions (1.0.3) + ffi ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -144,6 +197,9 @@ GEM thor mixlib-log (2.0.4) mixlib-shellout (2.4.0) + mixlib-shellout (2.4.0-universal-mingw32) + win32-process (~> 0.8.2) + wmi-lite (~> 1.0) mixlib-versioning (1.2.2) molinillo (0.6.6) multi_json (1.13.1) @@ -160,9 +216,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) @@ -226,6 +282,7 @@ GEM net-ssh (>= 2.7) net-telnet (= 0.1.1) sfl + structured_warnings (0.3.0) syslog-logger (1.6.8) systemu (2.6.5) test-kitchen (1.23.2) @@ -243,6 +300,29 @@ GEM citrus (~> 3.0, > 3.0) tomlrb (1.2.7) uuidtools (2.1.5) + win32-api (1.5.3-universal-mingw32) + win32-dir (0.5.1) + ffi (>= 1.0.0) + win32-event (0.6.3) + win32-ipc (>= 0.6.0) + win32-eventlog (0.6.3) + ffi + win32-ipc (0.7.0) + ffi + win32-mmap (0.4.2) + ffi + win32-mutex (0.4.3) + win32-ipc (>= 0.6.0) + win32-process (0.8.3) + ffi (>= 1.0.0) + win32-service (1.0.1) + ffi + ffi-win32-extensions + win32-taskscheduler (1.0.12) + ffi + structured_warnings + windows-api (0.4.4) + win32-api (>= 1.4.5) winrm (2.2.3) builder (>= 2.1.2) erubis (~> 2.7) @@ -255,7 +335,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) @@ -265,6 +345,8 @@ GEM PLATFORMS ruby + x64-mingw32 + x86-mingw32 DEPENDENCIES berkshelf (>= 7.0)