Merge pull request #5190 from chef/jk/ruby23

Use Ruby 2.3.1

3 files changed, 24 insertions, 25 deletions

diff --git a/.travis.yml b/.travis.yml
index dfee9acd79..d8ff98ad7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,13 +52,13 @@ matrix:
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.2.5
+    rvm: 2.3.1
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.2.5
+    rvm: 2.3.1
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -68,23 +68,23 @@ matrix:
   - env:
       TEST_GEM: chef-provisioning
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: chef-provisioning-aws
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: chef-sugar
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       - TEST_GEM: chef-zero
     script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: cheffish
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: chefspec
     # The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -93,26 +93,26 @@ matrix:
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
       - bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: foodcritic
     script: tasks/bin/run_external_test $TEST_GEM rake test
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: halite
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: knife-windows
     script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   - env:
       TEST_GEM: poise
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2.5
+    rvm: 2.3.1
   ### START TEST KITCHEN ONLY ###
   #
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -129,7 +129,7 @@ matrix:
     env:
       - UBUNTU=12.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -146,7 +146,7 @@ matrix:
     env:
       - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -163,7 +163,7 @@ matrix:
     env:
       - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -180,7 +180,7 @@ matrix:
     env:
       - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -197,7 +197,7 @@ matrix:
     env:
       - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -214,7 +214,7 @@ matrix:
     env:
       - CENTOS=6
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -231,7 +231,7 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -249,7 +249,7 @@ matrix:
       - FEDORA=23
       - KITCHEN_YAML=.kitchen.travis.yml
     ### END TEST KITCHEN ONLY ###
-  - rvm: 2.2.5
+  - rvm: 2.3.1
     sudo: required
     dist: trusty
     before_install:
diff --git a/appveyor.yml b/appveyor.yml
index 8a348295da..831ecf67e5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,9 +6,8 @@ platform:
 
 environment:
   matrix:
-    # 21-x64 is failing right now
-    # - ruby_version: "21-x64"
-    - ruby_version: "21"
+    - ruby_version: "23-x64"
+    - ruby_version: "23"
 
 clone_folder: c:\projects\chef
 clone_depth: 1
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0c90c65c7e..e75ed3de92 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.1.9"
+override "ruby", version: "2.3.1"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"