1 files changed, 18 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 2b79c25b11..d4bbe007df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,14 +63,27 @@ end
 
 platforms :jruby do
   gem 'json'
-  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
-
-  group :db do
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+  if ENV['AR_JDBC']
+    gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+      gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    end
+  else
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
+      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+    end
   end
 end
 
+platforms :rbx do
+  gem 'psych'
+  gem 'rubysl-mathn'
+  gem 'rubysl-matrix'
+end
+
 # gems that are necessary for ActiveRecord tests with Oracle database
 if ENV['ORACLE_ENHANCED']
   platforms :ruby do