diff options
| -rw-r--r-- | omnibus/Gemfile | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 45 |
2 files changed, 24 insertions, 27 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 735b371c62..652a6e69b8 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,8 +1,8 @@ source "https://rubygems.org" -gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate" -gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster" -gem "license_scout", github: "chef/license_scout" +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 ceb322bf20..476a76753b 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,24 +1,14 @@ GIT - remote: git://github.com/chef/license_scout.git - revision: f90293a9753652fb64994a14de4108e503c06632 + remote: https://github.com/chef/license_scout + revision: 83f16f6bbf7f0f9ef94cf694aea2881e65ee034c specs: license_scout (0.1.2) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) GIT - remote: git://github.com/chef/omnibus-software.git - revision: 086710002ec0054b3d240d14ca04d11163f528aa - branch: shain/ruby_windows_monster - specs: - omnibus-software (4.0.0) - chef-sugar (>= 3.4.0) - omnibus (>= 5.5.0) - -GIT - remote: git://github.com/chef/omnibus.git - revision: dce5283a85a44484a66a8a84991beba92e46fd12 - branch: rhass/COOL-502_with_gcc_investigate + remote: https://github.com/chef/omnibus + revision: 76d907f4fe92a28c5f7ab11779341e1d773c358d specs: omnibus (5.5.0) aws-sdk (~> 2) @@ -32,6 +22,13 @@ GIT ruby-progressbar (~> 1.7) thor (~> 0.18) + remote: https://github.com/chef/omnibus-software + revision: a6f5d260b34c5a19fb2ef873ab3216c7bab0ef6f + specs: + omnibus-software (4.0.0) + chef-sugar (>= 3.4.0) + omnibus (>= 5.5.0) + GEM remote: https://rubygems.org/ specs: @@ -39,13 +36,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.6.0) awesome_print (1.7.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + aws-sdk (2.8.2) + aws-sdk-resources (= 2.8.2) + aws-sdk-core (2.8.2) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.8.2) + aws-sdk-core (= 2.8.2) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -98,8 +95,8 @@ GEM erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.17) - ffi (1.9.17-x86-mingw32) + ffi (1.9.18) + ffi (1.9.18-x86-mingw32) ffi-yajl (2.3.0) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -216,15 +213,15 @@ GEM molinillo (~> 0.4.2) semverse (~> 1.1) systemu (2.6.5) - test-kitchen (1.15.0) + test-kitchen (1.16.0) mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) - thor (~> 0.18) - thor (0.19.4) + thor (~> 0.19, < 0.19.2) + thor (0.19.1) timers (4.0.4) hitimes varia_model (0.4.1) |