Bump JRuby and Bundler versions (#402)

jruby · Nov 18, 2016 · 8480292 · 8480292
1 parent 372b522
commit 8480292
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 rvm:
   - jruby-9.0.5.0
-  - jruby-9.1.2.0
+  - jruby-9.1.6.0
 branches:
   only:
     - master
@@ -12,7 +12,7 @@ matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false" TASK=test
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       env: TASK=integration
   allow_failures:
     - rvm: jruby-head

diff --git a/Mavenfile b/Mavenfile
@@ -6,7 +6,7 @@ gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
 properties( 'jruby.plugins.version' => '1.1.5',
-            'jruby.version' => '9.1.2.0',
+            'jruby.version' => '9.1.6.0',
             'jetty.version' => '9.2.10.v20150310' )
 
 # dependencies needed for compilation
@@ -23,7 +23,7 @@ plugin :invoker, '1.8' do
                  :properties => { 'warbler.version' => '${project.version}',
                                   'jruby.version' => '${jruby.version}',
                                   'jetty.version' => '${jetty.version}',
-                                  'bundler.version' => '1.12.3',
+                                  'bundler.version' => '1.12.5',
                                   'jruby.plugins.version' => '${jruby.plugins.version}' },
 
                  :goals => ['verify'],

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -10,9 +10,9 @@
   <properties>
     <jruby.plugins.version>1.1.5</jruby.plugins.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>9.1.2.0</jruby.version>
+    <jruby.version>9.1.6.0</jruby.version>
     <warbler.version>2.0.4</warbler.version>
-    <bundler.version>1.12.3</bundler.version>
+    <bundler.version>1.12.5</bundler.version>
     <gem.home>${basedir}/../../pkg/rubygems</gem.home>
     <gem.path>${basedir}/../../pkg/rubygems</gem.path>
   </properties>