diff options
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 48 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 28 insertions, 28 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6017b773a2..0b90b23604 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM inspec-core-bin (4.21.3) inspec-core (= 4.21.3) ipaddress (0.8.3) - iso8601 (0.12.2) + iso8601 (0.12.3) json (2.3.1) json_schemer (0.2.11) ecma-re-validator (~> 0.2) @@ -240,9 +240,9 @@ GEM tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) method_source (1.0.0) mixlib-archive (1.0.5) mixlib-log diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 696331c372..026d6dd5b5 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 2cf96c6c07de7d05ded6b45a0531feb10ae7cd9e + revision: c40e056b40cfae3f93a02a9ccbd33a1cfa21ed4c branch: master specs: omnibus-software (4.0.0) @@ -32,16 +32,16 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.337.0) - aws-sdk-core (3.102.1) + aws-partitions (1.338.0) + aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.35.0) + aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.72.0) + aws-sdk-s3 (1.73.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -64,19 +64,19 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.2.50) + chef (16.2.73) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.50) - chef-utils (= 16.2.50) + chef-config (= 16.2.73) + chef-utils (= 16.2.73) chef-vault chef-zero (>= 14.0.11) - diff-lcs (~> 1.2, >= 1.2.4) + diff-lcs (>= 1.2.4, < 1.4.0) ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -98,19 +98,19 @@ GEM train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.2.50-universal-mingw32) + chef (16.2.73-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.50) - chef-utils (= 16.2.50) + chef-config (= 16.2.73) + chef-utils (= 16.2.73) chef-vault chef-zero (>= 14.0.11) - diff-lcs (~> 1.2, >= 1.2.4) + diff-lcs (>= 1.2.4, < 1.4.0) ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -145,15 +145,15 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.2) - chef-config (16.2.50) + chef-config (16.2.73) addressable - chef-utils (= 16.2.50) + chef-utils (= 16.2.73) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.9) - chef-utils (16.2.50) + chef-utils (16.2.73) chef-vault (4.0.1) chef-zero (15.0.0) ffi-yajl (~> 2.2) @@ -164,7 +164,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) concurrent-ruby (1.1.6) - diff-lcs (1.4.3) + diff-lcs (1.3) ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) @@ -191,7 +191,7 @@ GEM iniparse (1.5.0) iostruct (0.0.4) ipaddress (0.8.3) - iso8601 (0.12.2) + iso8601 (0.12.3) jmespath (1.4.0) json (2.3.1) kitchen-vagrant (1.6.1) @@ -207,9 +207,9 @@ GEM mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) minitar (0.9) mixlib-archive (1.0.5) mixlib-log @@ -247,7 +247,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.2.1) + ohai (16.2.3) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -312,7 +312,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.3.4) + train-core (3.3.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 6d6e6d7762..179d9a6a08 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -15,7 +15,7 @@ override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" -override "nokogiri", version: "1.11.0.rc2" +override "nokogiri", version: "1.10.10" override "openssl", version: "1.0.2v" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.7.1" |