Exclude development mode in TK and berkshelf

After removing our dependency on the cucumber gem,
the development versions of cucumber in TK and berkshelf
were causing cascading appbundler dep failures.

It seems to have caused TK and berkshelf to pull in a
version of `cucumber` that was incompatible with the `cucumber-core`
required by foodcritic (not in dev mode).

`--without development` for TK and berkshelf prevents
the full version of `cucumber` from getting pulled in at all.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

components/gems/Gemfile

@@ -19,7 +19,7 @@ source "https://rubygems.org"
 
 #gemspec
 
-gem "bundler"
+gem "bundler", "< 2"
 
 group(:omnibus_package, :development, :test) do
   # we pin these gems as they are installed in the ruby source and if we let them
@@ -129,8 +129,7 @@ end
 
 gem "chefstyle", group: :test
 
-# TODO delete this when we figure out how to include the pushy windows dependencies
-# correctly
+# Ensure support for push-client on Windows
 platforms :mswin, :mingw do
   gem "rdp-ruby-wmi"
   gem "windows-pr"

components/gems/Gemfile.lock

@@ -51,7 +51,7 @@ GEM
     aws-sdk-codecommit (1.25.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.24.0)
+    aws-sdk-codedeploy (1.25.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-codepipeline (1.22.0)
@@ -77,13 +77,13 @@ GEM
     aws-sdk-ecr (1.19.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.43.0)
+    aws-sdk-ecs (1.44.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.23.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.21.0)
+    aws-sdk-elasticache (1.22.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.24.0)
@@ -446,7 +446,7 @@ GEM
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (4.7.3)
+    inspec (4.7.18)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -473,8 +473,8 @@ GEM
       train-habitat (~> 0.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-bin (4.7.3)
-      inspec (= 4.7.3)
+    inspec-bin (4.7.18)
+      inspec (= 4.7.18)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.3)
@@ -945,7 +945,7 @@ DEPENDENCIES
   artifactory
   bcrypt_pbkdf
   berkshelf (>= 7.0.5)
-  bundler
+  bundler (< 2)
   chef (= 15.1.36)
   chef-apply (>= 0.3.3)
   chef-bin (= 15.1.36)

omnibus/config/software/gems.rb

@@ -23,8 +23,8 @@
 
 dependency "ruby"
 dependency "rubygems"
-# Removed - r26 ships with bundler
-# dependency "bundler" # technically a gem, but we gotta solve the chicken-egg problem here
+# Remove? - r26 ships with bundler
+dependency "bundler" # technically a gem, but we gotta solve the chicken-egg problem here
 
 #
 # NOTE: Do not add any gem dependencies here.  This will cause gemsets to solve without
@@ -69,13 +69,14 @@
   appbundle "chef", lockdir: project_dir, gem: "chef", without: %w{docgen chefstyle}, env: env
 
   appbundle "foodcritic", lockdir: project_dir, gem: "foodcritic", without: %w{development test}, env: env
-  appbundle "test-kitchen", lockdir: project_dir, gem: "test-kitchen", without: %w{changelog debug docs}, env: env
+  appbundle "test-kitchen", lockdir: project_dir, gem: "test-kitchen", without: %w{changelog debug docs development}, env: env
   appbundle "inspec", lockdir: project_dir, gem: "inspec-bin", without: %w{deploy tools maintenance integration}, env: env
   appbundle "chef-run", lockdir: project_dir, gem: "chef-apply", without: %w{changelog docs debug}, env: env
   appbundle "chef-cli", lockdir: project_dir, gem: "chef-cli", without: %w{changelog docs debug}, env: env
+  appbundle "berkshelf", lockdir: project_dir, gem: "berkshelf", without: %w{changelog docs debug development}, env: env
 
   # Note - 'chef-apply' gem provides 'chef-run', not 'chef-apply' which ships with chef-bin...
-  %w{chef-bin chef-apply chef-vault ohai opscode-pushy-client cookstyle berkshelf}.each do |gem|
+  %w{chef-bin chef-apply chef-vault ohai opscode-pushy-client cookstyle}.each do |gem|
     appbundle gem, lockdir: project_dir, gem: gem, without: %w{changelog}, env: env
   end