version_policy.rb in chef-dk-1.1.16 vs version_policy.rb in chef-dk-1.2.20

@@ -45,24 +45,24 @@
   "zlib" => "1.2.8",
   # The windows dependency (libzmq4x-windows) only has 1 version so far in
   # software def so we don't need to override that
   "libzmq" => "4.0.5",
 
-  ## These can float as they are frequently updated in a way that works for us
-  #override "cacerts" =>"???",
-  #override "openssl" =>"???",
+  # For 1.2 stable release only, pin to 1.1.0 of kitchen-dokken. After the 1.2
+  # release, unpin and bring in kitchen-dokken 2.x.
+  "kitchen-dokken" => "1.1.0"
 }
 
 #
 # rake dependencies:update_omnibus_overrides (tasks/dependencies.rb) reads this
 # and modifies omnibus_overrides.rb
 #
 # The left side is the software definition name, and the right side is the
 # name of the rubygem (gem list -re <rubygem name> gets us the latest version).
 #
 OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
-  #rubygems: "rubygems-update", # pinned to 2.6.4 until https://github.com/rubygems/rubygems/pull/1683 is released
+  rubygems: "rubygems-update",
   # bundler: "bundler", # pinned to 1.12.5 until we figure out how we're failing on 1.13.0
 }
 
 #
 # rake dependencies:check (tasks/dependencies.rb) uses this as a list of gems
@@ -74,11 +74,11 @@
 #
 ACCEPTABLE_OUTDATED_GEMS = [
   "activesupport",     # anchored by outdated google-api-client
   "celluloid",         # ridley requires 0.16.x
   "celluloid-io",      # ridley requires 0.16.x
-  "cucumber-core", # Until cucumber 2.0
+  "cucumber-core",     # Until cucumber 2.0
   "fog-cloudatcost",   # fog restricts this for probably no good reason
   "fog-dynect",        # fog restricts this for probably no good reason
   "fog-google",        # fog-google 0.2+ requires Ruby 2.0+, fog 2.0.0 will include it
   "google-api-client", # chef-provisioning-fog restricts to < 0.9 for presently unknown reasons
   "json",              # inspec pins this because Ruby 2.0, no eta on fix
@@ -86,9 +86,13 @@
   "rbvmomi",           # fog-vsphere restricts this to a patch version, not sure why
   "retriable",         # anchored by outdated google-api-client
   "rubocop",           # cookstyle pins to 0.39.0 in 0.0.1
   "slop",              # expected to disappear with pry 0.11
   "timers",            # anchored by outdated celluloid
+  "github_changelog_generator", # we use a forked version that differs from rubygems
+  "addressable",       # sawyer limits to < 2.6
+  "faraday",           # ridely restrcits this 0.9.x
+  "thor",              # berkshelf restricts this to < 0.19.2
 
   # We have a task called update_stable_channel_gems which scans and pins to the
   # latest released chef/chef-config/opscode-pushy-client but it pulls from the
   # chef repo instead of from rubygems. Bundler currently considers any git
   # source at the same version (or lower) than one available from rubygems as