diff options
author | Thom May <thom@may.lt> | 2018-02-09 13:53:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 13:53:07 +0100 |
commit | 5bb5333d80b8c0d1cf82b0b867beff61fbfdfe2a (patch) | |
tree | 5775df6def6c650a9acc51d22087c00db4b8919c | |
parent | ea69e39fc924110c21ce1ef018555ee59cdb7a1e (diff) | |
parent | c17a4fc122d3eb5344885e00ab9fdc623b4ebaed (diff) | |
download | chef-5bb5333d80b8c0d1cf82b0b867beff61fbfdfe2a.tar.gz |
Merge pull request #6841 from chef/tduffield/license_scout/1.x
Use the version of LicenseScout that comes with the Omnibus gem.
-rw-r--r-- | omnibus/Gemfile | 1 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 44 |
2 files changed, 19 insertions, 26 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 652a6e69b8..dbf7409032 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus" gem "omnibus-software", git: "https://github.com/chef/omnibus-software" -gem "license_scout", git: "https://github.com/chef/license_scout" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 93c4bcdc7f..392bc53a9c 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,22 +1,13 @@ GIT - remote: https://github.com/chef/license_scout - revision: d044136f0b464ed3894a172f06a50167106ec5d1 - specs: - license_scout (0.1.3) - ffi-yajl (~> 2.2) - mixlib-shellout (~> 2.2) - toml-rb (~> 1.0) - -GIT remote: https://github.com/chef/omnibus - revision: fd1451bca299d0d71aa2c58d63fee5120572f739 + revision: 68c301587d8856c6ec4445a24ec49365bb22a314 specs: - omnibus (5.6.3) + omnibus (5.6.8) aws-sdk (~> 2) chef-sugar (~> 3.3) cleanroom (~> 1.0) ffi-yajl (~> 2.2) - license_scout + license_scout (~> 1.0) mixlib-shellout (~> 2.0) mixlib-versioning ohai (~> 8.0) @@ -26,7 +17,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 45fbdeb158cc16984a65104681d842b3d026e111 + revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -38,13 +29,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.10.124) - aws-sdk-resources (= 2.10.124) - aws-sdk-core (2.10.124) + aws-sdk (2.10.128) + aws-sdk-resources (= 2.10.128) + aws-sdk-core (2.10.128) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.124) - aws-sdk-core (= 2.10.124) + aws-sdk-resources (2.10.128) + aws-sdk-core (= 2.10.128) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -79,7 +70,7 @@ GEM buff-shell_out (0.2.0) buff-ruby_engine (~> 0.1.0) builder (3.2.3) - byebug (9.1.0) + byebug (10.0.0) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) @@ -99,9 +90,9 @@ GEM erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) - ffi (1.9.18-x64-mingw32) - ffi (1.9.18-x86-mingw32) + ffi (1.9.21) + ffi (1.9.21-x64-mingw32) + ffi (1.9.21-x86-mingw32) ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -120,6 +111,10 @@ GEM kitchen-vagrant (0.19.0) test-kitchen (~> 1.4) libyajl2 (1.2.0) + license_scout (1.0.0) + ffi-yajl (~> 2.2) + mixlib-shellout (~> 2.2) + toml-rb (~> 1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -176,8 +171,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) + pry-byebug (3.6.0) + byebug (~> 10.0) pry (~> 0.10) pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) @@ -262,7 +257,6 @@ PLATFORMS DEPENDENCIES berkshelf (~> 4.0) kitchen-vagrant (~> 0.19.0) - license_scout! omnibus! omnibus-software! pedump |