[travis-ci] try to not mess with RG installation on 9K + adjust for sanity

Author: kares

.travis.yml

@@ -28,11 +28,10 @@ gemfile:
   ##- JRUBY_OPTS="--1.8 $JRUBY_OPTS"
   #- JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION" # for mvn's jruby plugins
 before_script:
-  - export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false -J-XX:MaxPermSize=128m"
-  #- export JRUBY_VERSION="1.7.16"
+  - export JRUBY_OPTS="-Xcompile.invokedynamic=false -J-XX:MaxPermSize=96M"
 before_install:
   # NOTE: RubyGems 2.4.x fails us at application_spec's gem_install_rack_unless_installed !
-  - (jruby --1.9 -S gem update --system 2.2.3) || true
+  - ((jruby -v | grep -v 9.[0-9].[0-9].[0-9]) && jruby --1.9 -S gem update --system 2.2.3) || true
   - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
   - ((echo $BUNDLE_GEMFILE | grep rails23) && jruby --1.9 -S gem update --system 1.8.29) || true
 matrix:
@@ -74,10 +73,6 @@ matrix:
       gemfile: gemfiles/railsNG.gemfile
       jdk: oraclejdk8
     ## rails 2.3 --1.8
-    - rvm: jruby-1.7.4
-      gemfile: gemfiles/rails23.gemfile
-      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
-      jdk: openjdk6
     - rvm: jruby-1.7.4
       gemfile: gemfiles/rails23.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -95,9 +90,9 @@ matrix:
       gemfile: gemfiles/rails31.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
       jdk: oraclejdk7
-    - rvm: jruby-1.7.4
-      gemfile: gemfiles/rails31.gemfile
-      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
+    - rvm: jruby-1.7.26
+      gemfile: gemfiles/rails32.gemfile
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS"
       jdk: oraclejdk8
   exclude:
 #    ## avoid jruby-9K with JDK6 :