From 13d2663bc47b7e47c023d709076474247ee117ab Mon Sep 17 00:00:00 2001
From: Charles Oliver Nutter <headius@headius.com>
Date: Tue, 14 Jul 2020 21:51:08 -0500
Subject: [PATCH] Use Gemfile to install rspec for now

Something changed on rubygems.org that's causing the mavengem
plugin to produce "marshal data too short" errors. While we
investigate, remove rspec from -Pbootstrap mavengems and instead
use bundler to install it in CI.

See https://github.com/torquebox/jruby-maven-plugins/issues/107
---
 .travis.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 Gemfile     |  3 +++
 test/pom.rb |  1 -
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 Gemfile

diff --git a/.travis.yml b/.travis.yml
index be1ba632af0..afc71fbb963 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,40 +47,54 @@ matrix:
       name: MRI core int
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:mri:core:int
       env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'
 
     - name: MRI core fullint
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:mri:core:fullint
       env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'
 
     - name: MRI core jit
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:mri:core:jit
 
     - name: MRI extra
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:mri:extra
       env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'
 
     - name: MRI stdlib
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:mri:stdlib
       env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'
 
     - name: spec/ruby fast
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:ruby:fast
 
     - name: spec/ruby slow
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:ruby:slow
 
     - env: COMMAND=test/check_versions.sh
@@ -102,74 +116,102 @@ matrix:
     - name: JRuby tests jit
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:jruby
 
     - name: JRuby tests jit indy
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:jruby
       env: JRUBY_OPTS=-Xcompile.invokedynamic
 
     - name: JRuby tests aot
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:jruby:aot
 
     - name: JRuby tests fullint
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:jruby:fullint
 
     - name: JRuby slow tests
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake test:slow_suites
 
     - name: JI specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:ji
 
     - name: Compiler specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:compiler
 
     - name: Compiler specs indy
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:compiler
       env: JRUBY_OPTS=-Xcompile.invokedynamic
 
     - name: FFI specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:ffi
 
     - name: Regression specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:regression
 
     - name: Regression specs jit
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:regression
       env: JRUBY_OPTS=-Xjit.threshold=0
 
     - name: JRuby specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:jruby
 
     - name: jrubyc specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:jrubyc
 
     - name: Profilers specs
       script:
         - mvn clean package -Pbootstrap
+        - gem install bundler
+        - bundle install
         - jruby -S rake spec:profiler
 
     - env: PHASE='-Pdist'
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000000..ed86ed5ccde
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'rspec', '3.9.0'
diff --git a/test/pom.rb b/test/pom.rb
index d5d1c05ec1c..a172e0243da 100644
--- a/test/pom.rb
+++ b/test/pom.rb
@@ -36,7 +36,6 @@
   jar( 'org.jruby:requireTest:1.0',
        :scope => 'system',
        :systemPath => '${project.basedir}/jruby/requireTest-1.0.jar' )
-  gem 'rspec', '${rspec.version}'
 
   overrides do
     plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0',