diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b80a329c7..1679cc9da 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,19 +1,18 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: e1779458769356ae6fed51fb7c3685829b6e2a5b + revision: 722d2a8b7f74b98ee44efadac6d74daa5559a48d specs: omnibus-software (4.0.0) - chef-sugar (>= 3.4.0) omnibus (>= 5.6.1) GIT remote: https://github.com/chef/omnibus.git - revision: c872e61c30d2b3f88ead03bd1254ff96d37059a3 + revision: f38dcb57017e007c7e98a9934e881904a5e09907 specs: - omnibus (6.1.3) + omnibus (7.0.6) aws-sdk-s3 (~> 1) + chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) - cleanroom (~> 1.0) ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (>= 2.0, < 4.0) @@ -21,33 +20,33 @@ GIT ohai (>= 13, < 16) pedump ruby-progressbar (~> 1.7) - thor (~> 0.18) + thor (>= 0.18, < 2.0) GEM remote: https://rubygems.org/ specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.5) + artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.213.0) - aws-sdk-core (3.68.0) + aws-partitions (1.279.0) + aws-sdk-core (3.90.1) aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.48.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.60.2) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) + aws-sigv4 (1.1.1) aws-eventstream (~> 1.0, >= 1.0.2) bcrypt_pbkdf (1.0.1) - berkshelf (7.0.8) + berkshelf (7.0.9) chef (>= 13.6.52) chef-config cleanroom (~> 1.0) @@ -60,12 +59,30 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20) - builder (3.2.3) - chef (15.2.20) + builder (3.2.4) + celluloid (0.17.4) + celluloid-essentials + celluloid-extras + celluloid-fsm + celluloid-pool + celluloid-supervision + timers (>= 4.1.1) + celluloid-essentials (0.20.5) + timers (>= 4.1.1) + celluloid-extras (0.20.5) + timers (>= 4.1.1) + celluloid-fsm (0.20.5) + timers (>= 4.1.1) + celluloid-pool (0.20.5) + timers (>= 4.1.1) + celluloid-supervision (0.20.6) + timers (>= 4.1.1) + chef (15.8.23) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.2.20) + chef-config (= 15.8.23) + chef-utils (= 15.8.23) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -77,10 +94,10 @@ GEM iniparse (~> 1.4) license-acceptance (~> 1.0, >= 1.0.5) mixlib-archive (>= 0.4, < 2.0) - mixlib-authentication (~> 2.1) + mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) - mixlib-shellout (>= 2.4, < 4.0) + mixlib-shellout (>= 3.0.3, < 4.0) net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 4.2, < 6) net-ssh-multi (~> 1.2, >= 1.2.1) @@ -88,83 +105,87 @@ GEM plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 2.0, >= 2.0.12) + train-core (~> 3.1) + train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-config (15.2.20) + chef-cleanroom (1.0.2) + chef-config (15.8.23) addressable + chef-utils (= 15.8.23) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-sugar (5.0.1) - chef-zero (14.0.12) + chef-sugar (5.1.9) + chef-utils (15.8.23) + chef-zero (15.0.0) ffi-yajl (~> 2.2) - hashie (>= 2.0, < 4.0) + hashie (>= 2.0, < 5.0) mixlib-log (>= 2.0, < 4.0) rack (~> 2.0, >= 2.0.6) uuidtools (~> 2.1) citrus (3.0.2) cleanroom (1.0.0) - concurrent-ruby (1.1.5) + coderay (1.1.2) + concurrent-ruby (1.1.6) diff-lcs (1.3) ed25519 (1.2.4) equatable (0.6.1) + erubi (1.9.0) erubis (2.7.0) - faraday (0.15.4) + faraday (1.0.0) multipart-post (>= 1.2, < 3) - ffi (1.11.1) - ffi-libarchive (0.4.10) + ffi (1.12.2) + ffi-libarchive (1.0.0) ffi (~> 1.0) - ffi-yajl (2.3.1) + ffi-yajl (2.3.3) libyajl2 (~> 1.2) fuzzyurl (0.9.0) gssapi (1.3.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.6.0) + hashie (4.1.0) highline (1.7.10) httpclient (2.8.3) - iniparse (1.4.4) + inifile (3.0.0) + iniparse (1.5.0) iostruct (0.0.4) ipaddress (0.8.3) jmespath (1.4.0) - json (2.2.0) - kitchen-vagrant (1.6.0) - test-kitchen (>= 1.4, < 3) + json (2.3.0) + kitchen-vagrant (0.11.3) + test-kitchen (~> 1.0.0.beta) libyajl2 (1.2.0) license-acceptance (1.0.13) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) - license_scout (1.0.24) + license_scout (1.1.7) ffi-yajl (~> 2.2) - mixlib-shellout (~> 2.2) - toml-rb (~> 1.0) + mixlib-shellout (>= 2.2, < 4.0) + toml-rb (>= 1, < 3) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - minitar (0.8) - mixlib-archive (1.0.1) + method_source (0.9.2) + minitar (0.9) + mixlib-archive (1.0.5) mixlib-log - mixlib-authentication (2.1.1) - mixlib-cli (2.1.1) - mixlib-config (3.0.1) + mixlib-authentication (3.0.6) + mixlib-cli (2.1.5) + mixlib-config (3.0.6) tomlrb - mixlib-install (3.11.18) - mixlib-shellout - mixlib-versioning - thor - mixlib-log (3.0.1) - mixlib-shellout (2.4.4) - mixlib-versioning (1.2.7) + mixlib-log (3.0.8) + mixlib-shellout (3.0.9) + mixlib-versioning (1.2.12) molinillo (0.6.6) - multi_json (1.13.1) - multipart-post (2.0.0) - necromancer (0.5.0) + multi_json (1.14.1) + multipart-post (2.1.1) + necromancer (0.5.1) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-sftp (2.1.2) @@ -176,9 +197,10 @@ GEM net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) nori (2.6.0) - octokit (4.14.0) + octokit (4.16.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.3.1) + ohai (15.7.4) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -193,96 +215,98 @@ GEM pastel (0.7.3) equatable (~> 0.6) tty-color (~> 0.5) - pedump (0.5.2) + pedump (0.5.4) awesome_print iostruct (>= 0.0.4) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0) progressbar + rainbow zhexdump (>= 0.0.2) plist (3.5.0) progressbar (1.10.1) proxifier (1.0.3) - public_suffix (4.0.1) - rack (2.0.8) - retryable (3.0.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (4.0.3) + rack (2.2.2) + rainbow (3.0.0) + retryable (3.0.5) ruby-progressbar (1.10.1) rubyntlm (0.6.2) - rubyzip (1.2.3) + rubyzip (2.2.0) + safe_yaml (0.9.7) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) semverse (3.0.0) - solve (4.0.2) + solve (4.0.3) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) - strings (0.1.5) + strings (0.1.8) strings-ansi (~> 0.1) unicode-display_width (~> 1.5) unicode_utils (~> 1.4) - strings-ansi (0.1.0) + strings-ansi (0.2.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (2.2.5) - bcrypt_pbkdf (~> 1.0) - ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) - mixlib-install (~> 3.6) - mixlib-shellout (>= 1.2, < 3.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) - net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) - winrm (~> 2.0) - winrm-elevated (~> 1.0) - winrm-fs (~> 1.1) - thor (0.20.3) - toml-rb (1.1.2) + test-kitchen (1.0.0.beta.3) + celluloid + mixlib-shellout + net-scp + net-ssh + pry + safe_yaml (~> 0.9.5) + thor + thor (1.0.1) + timers (4.3.0) + toml-rb (2.0.1) citrus (~> 3.0, > 3.0) - tomlrb (1.2.8) - train-core (2.1.19) + tomlrb (1.2.9) + train-core (3.2.23) + addressable (~> 2.5) + inifile (~> 3.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) net-ssh (>= 2.9, < 6.0) + train-winrm (0.2.6) winrm (~> 2.0) winrm-fs (~> 1.0) - tty-box (0.4.0) + tty-box (0.5.0) pastel (~> 0.7.2) - strings (~> 0.1.5) + strings (~> 0.1.6) tty-cursor (~> 0.7) - tty-color (0.5.0) - tty-cursor (0.7.0) - tty-prompt (0.19.0) + tty-color (0.5.1) + tty-cursor (0.7.1) + tty-prompt (0.20.0) necromancer (~> 0.5.0) pastel (~> 0.7.0) - tty-reader (~> 0.6.0) - tty-reader (0.6.0) + tty-reader (~> 0.7.0) + tty-reader (0.7.0) tty-cursor (~> 0.7) tty-screen (~> 0.7) wisper (~> 2.0.0) - tty-screen (0.7.0) - unicode-display_width (1.6.0) + tty-screen (0.7.1) + unicode-display_width (1.6.1) unicode_utils (1.4.0) uuidtools (2.1.5) - winrm (2.3.2) + winrm (2.3.4) builder (>= 2.1.2) - erubis (~> 2.7) + erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.1.1) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.2) - erubis (~> 2.7) + winrm-fs (1.3.4) + erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) - wisper (2.0.0) - wmi-lite (1.0.2) + wisper (2.0.1) + wmi-lite (1.0.5) zhexdump (0.0.2) PLATFORMS @@ -297,4 +321,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.17.3 + 2.1.2 diff --git a/omnibus/config/projects/supermarket.rb b/omnibus/config/projects/supermarket.rb index ba74e9f7b..ee5f0b801 100644 --- a/omnibus/config/projects/supermarket.rb +++ b/omnibus/config/projects/supermarket.rb @@ -30,9 +30,9 @@ override :postgresql, version: '9.3.18' override :ruby, version: "2.6.5" -override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which makes the omnibus environment unhappy. Make sure these versions match before bumping either. -override :bundler, version: "1.17.3" # this must match the BUNDLED WITH in all the repo's Gemfile.locks -override :'chef-gem', version: '14.5.33' +override :rubygems, version: "3.1.2" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which makes the omnibus environment unhappy. Make sure these versions match before bumping either. +override :bundler, version: "2.1.2" # this must match the BUNDLED WITH in all the repo's Gemfile.locks +override :'chef-gem', version: '14.14.29' override :'openssl-fips', version: '2.0.16' override :'omnibus-ctl', version: 'master' diff --git a/omnibus/config/software/supermarket-cookbooks.rb b/omnibus/config/software/supermarket-cookbooks.rb index fa7d52aa3..a77739146 100644 --- a/omnibus/config/software/supermarket-cookbooks.rb +++ b/omnibus/config/software/supermarket-cookbooks.rb @@ -17,14 +17,13 @@ name "supermarket-cookbooks" license :project_license -dependency "berkshelf" - source path: "cookbooks/omnibus-supermarket" build do cookbooks_path = "#{install_dir}/embedded/cookbooks" env = with_standard_compiler_flags(with_embedded_path) + gem "install berkshelf" command "berks vendor #{cookbooks_path}", env: env block do diff --git a/src/supermarket/Gemfile.lock b/src/supermarket/Gemfile.lock index 3a1001414..395f63bb9 100644 --- a/src/supermarket/Gemfile.lock +++ b/src/supermarket/Gemfile.lock @@ -679,4 +679,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.17.3 + 2.1.2 diff --git a/src/supermarket/engines/fieri/Gemfile.lock b/src/supermarket/engines/fieri/Gemfile.lock index 713601610..9a6666e92 100644 --- a/src/supermarket/engines/fieri/Gemfile.lock +++ b/src/supermarket/engines/fieri/Gemfile.lock @@ -233,4 +233,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.3 + 2.1.2