From a7f07883f0de1a55367f61ca9743246491e5511f Mon Sep 17 00:00:00 2001
From: Samuel <samuel@puppet.com>
Date: Tue, 28 Nov 2017 12:11:59 -0600
Subject: [PATCH] specify bundler version 1.15.4

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26ce350..100ea5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,14 +27,11 @@ matrix:
     - rvm: 2.3.3
       env: "CHECK=rubocop"
   
-# This below is a temporary shim to bypass these bundler+jruby bugs:
-# 
-#   https://github.com/bundler/bundler/issues/4975
-#   https://github.com/bundler/bundler/issues/4984
+# Pin to specific rubygem and bundler for jruby tests
 install:
   - gem update --system 2.6.14
   - gem install bundler --version 1.15.4
-  - bundle --version
-  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+  - bundle _1.15.4_ --version
+  - bundle _1.15.4_ install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 script: 
-  - "bundle exec rake $CHECK"
+  - "bundle _1.15.4_ exec rake $CHECK"