version_policy.rb in chef-dk-0.17.17 vs version_policy.rb in chef-dk-0.18.26

- old
+ new

@@ -15,10 +15,12 @@ # limitations under the License. # # Explicit omnibus overrides. OMNIBUS_OVERRIDES = { + # Until 1.13.0 is released + :bundler => "1.12.5", # Lower level library pins ## according to comment in omnibus-sw, latest versions don't work on solaris # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23 "libffi" => "3.2.1", "libiconv" => "1.14", @@ -30,11 +32,11 @@ "libxslt" => "1.1.29", "libyaml" => "0.1.6", "makedepend" => "1.0.5", "ncurses" => "5.9", "pkg-config-lite" => "0.28-1", - "ruby" => "2.1.8", + "ruby" => "2.3.1", # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want # to unnecessarily make the client any fatter. (Since it's different between # 32 and 64, we have to do it in the project file still.) # "ruby-windows-devkit" => "4.5.2-20111229-1559", "ruby-windows-devkit-bash" => "3.1.23-4-msys-1.0.18", @@ -56,12 +58,12 @@ # # 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", - bundler: "bundler", + #rubygems: "rubygems-update", # pinned to 2.6.4 until https://github.com/rubygems/rubygems/pull/1683 is released + # 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 # that are allowed to be outdated according to `bundle updated` @@ -69,29 +71,26 @@ # Once you decide that the list of outdated gems is OK, you can just # add gems to the output of bundle outdated here and we'll parse it to get the # list of outdated gems. # ACCEPTABLE_OUTDATED_GEMS = [ - "celluloid", - "celluloid-io", - "docker-api", - "fog-cloudatcost", - "fog-google", - "gherkin", # fixed in cucumber-core > 1.4.0 - "google-api-client", - "jwt", # fixed in oauth2 > 1.1.0 - "listen", - "mime-types", - "mini_portile2", # dep removed in nokogiri > 1.6.7.2 - "retriable", - "rubocop", - "slop", # deo removed in pry > 0.10.3 - "timers", - "unicode-display_width", - "varia_model", - "httpclient", - "molinillo", + "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 + "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 + "rack", # chef-zero pins this because Ruby 2.0, no eta on fix + "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 + # 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 # outdated and hence fails the outdated gem test, confusing Julia bot. @@ -100,9 +99,10 @@ # update_stable_channel_gems changes, this exclusion can be revisited. "chef", "chef-config", "opscode-pushy-client", "mixlib-cli" + ] # # Some gems are part of our bundle (must be installed) but not important # enough to lock. We allow `bundle install` in test-kitchen, berks, etc.