Making rake:dependencies work

8 files changed, 53 insertions, 57 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 5cd0539227..62a9a9d76f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.0.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
@@ -246,12 +246,10 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.11.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    nokogiri (1.6.8-x86-mingw32)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.2-x86-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
@@ -275,7 +273,6 @@ GEM
       wmi-lite (~> 1.0)
     parser (2.3.1.2)
       ast (~> 2.2)
-    pkg-config (1.1.7)
     plist (3.2.0)
     poise (2.7.0)
       halite (~> 1.0)
@@ -297,7 +294,7 @@ GEM
       pry (>= 0.9.11)
     rack (1.6.4)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-readline (0.5.3)
     retryable (2.0.3)
     rspec (3.4.0)
@@ -416,7 +413,7 @@ DEPENDENCIES
   halite
   knife-windows
   netrc
-  nokogiri
+  nokogiri (= 1.6.7.2)
   octokit
   poise
   pry
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 840e1a49c4..82531beba6 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,13 +11,13 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.9)
-      aws-sdk-resources (= 2.3.9)
-    aws-sdk-core (2.3.9)
+    aws-sdk (2.3.13)
+      aws-sdk-resources (= 2.3.13)
+    aws-sdk-core (2.3.13)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.9)
-      aws-sdk-core (= 2.3.9)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.13)
+      aws-sdk-core (= 2.3.13)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -29,6 +29,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -52,7 +53,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.10.24)
+    chef-config (12.11.18)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -75,7 +76,7 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.22.1)
+    inspec (0.25.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -107,13 +108,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.1.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -189,7 +188,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.0)
+    test-kitchen (1.9.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 31e49b3e18..407b685236 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -5,4 +5,4 @@ cookbook "base", path: "cookbooks/base"
 
 cookbook "php", "~> 1.5.0"
 
-cookbook "resolver", github: "chef-cookbooks/resolver", branch: "lcg/docker"
+cookbook "resolver", github: "chef-cookbooks/resolver"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index f4a9de89e2..3b5e91ddb7 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -4,14 +4,14 @@ DEPENDENCIES
   php (~> 1.5.0)
   resolver
     git: git://github.com/chef-cookbooks/resolver.git
-    revision: dd65ab8e2346cc0739c13682c74868f5b939b06a
-    branch: lcg/docker
+    revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
   webapp
     path: cookbooks/webapp
 
 GRAPH
   apache2 (3.2.2)
-  apt (3.0.0)
+  apt (4.0.0)
+    compat_resource (>= 0.0.0)
   aws (3.3.3)
     ohai (>= 2.1.0)
   base (0.1.0)
@@ -30,18 +30,19 @@ GRAPH
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  build-essential (4.0.0)
-    mingw (>= 0.0.0)
+  build-essential (6.0.0)
+    compat_resource (>= 12.10)
+    mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (4.5.2)
+  chef-client (4.6.0)
     cron (>= 1.7.0)
     logrotate (>= 1.9.0)
-    windows (>= 1.39.0)
+    windows (>= 1.42.0)
   chef-sugar (3.3.0)
   chef_handler (1.4.0)
   chef_hostname (0.4.1)
     compat_resource (>= 0.0.0)
-  compat_resource (12.10.4)
+  compat_resource (12.10.6)
   cron (1.7.6)
   database (2.3.1)
     aws (>= 0.0.0)
@@ -49,11 +50,11 @@ GRAPH
     mysql-chef_gem (~> 0.0)
     postgresql (>= 1.0.0)
     xfs (>= 0.0.0)
-  iis (4.1.7)
+  iis (4.1.8)
     windows (>= 1.34.6)
   iptables (2.2.0)
   logrotate (1.9.2)
-  mingw (1.0.0)
+  mingw (1.2.0)
     compat_resource (>= 0.0.0)
     seven_zip (>= 0.0.0)
   multipackage (3.0.28)
@@ -63,11 +64,11 @@ GRAPH
   mysql-chef_gem (0.0.5)
     build-essential (>= 0.0.0)
     mysql (>= 0.0.0)
-  nscd (4.0.0)
+  nscd (4.1.0)
     compat_resource (>= 0.0.0)
   ntp (2.0.0)
     windows (>= 1.38.0)
-  ohai (4.0.2)
+  ohai (4.1.0)
     compat_resource (>= 12.9.0)
   openssh (2.0.0)
     iptables (>= 1.0)
@@ -97,13 +98,13 @@ GRAPH
     database (~> 2.3.1)
     mysql (~> 5.6.3)
     php (~> 1.5.0)
-  windows (1.41.0)
+  windows (1.43.0)
     chef_handler (>= 0.0.0)
   xfs (2.0.1)
   xml (2.0.0)
     build-essential (>= 0.0.0)
     chef-sugar (>= 0.0.0)
-  yum (3.10.0)
+  yum (3.11.0)
   yum-epel (0.7.0)
     yum (>= 3.6.3)
   yum-mysql-community (0.2.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 8ab7fbe707..36d2dfc037 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,13 +3,13 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.9)
-      aws-sdk-resources (= 2.3.9)
-    aws-sdk-core (2.3.9)
+    aws-sdk (2.3.13)
+      aws-sdk-resources (= 2.3.13)
+    aws-sdk-core (2.3.13)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.9)
-      aws-sdk-core (= 2.3.9)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.13)
+      aws-sdk-core (= 2.3.13)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -21,6 +21,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -44,7 +45,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.10.24)
+    chef-config (12.11.18)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -58,7 +59,7 @@ GEM
     excon (0.49.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.10-x86-mingw32)
     fuzzyurl (0.8.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -68,7 +69,7 @@ GEM
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
     httpclient (2.7.2)
-    inspec (0.22.1)
+    inspec (0.25.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -104,13 +105,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.1.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -189,7 +188,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.0)
+    test-kitchen (1.9.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index d971dd99fa..2f22da0511 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
 override :rubygems, version: "2.6.4"
-override :bundler, version: "1.11.2"
+override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
 override "liblzma", version: "5.2.2"
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index eb4bb1f44f..0b216f8e52 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -85,13 +85,11 @@ namespace :dependencies do
                                                      other_platforms: false, leave_frozen: false
   gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{
     kitchen-tests
-    kitchen-tests/test/integration/webapp/serverspec
   }
   berksfile_lock_task :update_kitchen_tests_berksfile_lock, dirs: %w{
     kitchen-tests
     kitchen-tests/cookbooks/audit_test
   }
-  # kitchen-tests/cookbooks/webapp isn't solving right now ....
 
   desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}."
   task :update_omnibus_overrides do |t, rake_args|
diff --git a/version_policy.rb b/version_policy.rb
index 8d450010d3..128b52d0ba 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -73,6 +73,7 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
 # slop - expected to disappear with new pry release
 # stove - halite pins to ~> 3.2 in 1.2.1
 # rubocop - chef-style pins to 0.39.0 in 0.3.1
+# TODO remove nokogiri when we can update to 1.6.8
 #
 ACCEPTABLE_OUTDATED_GEMS = %w{
   gherkin
@@ -81,6 +82,7 @@ ACCEPTABLE_OUTDATED_GEMS = %w{
   slop
   stove
   rubocop
+  nokogiri
 }
 
 #