aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-11 22:06:40 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-11 22:06:40 -0700
commit0f834868bfd0d98c6d144543bc49c86df53e9a91 (patch)
treeda230aa00ebdc0530a76193a88b3dba97465bd61 /Gemfile
parent2fa83ee1e48c283a4301db90f7518a975e146e23 (diff)
parent53d682b1320828d9a0ec31431d1ab54cae03753c (diff)
downloadrails-0f834868bfd0d98c6d144543bc49c86df53e9a91.tar.gz
rails-0f834868bfd0d98c6d144543bc49c86df53e9a91.tar.bz2
rails-0f834868bfd0d98c6d144543bc49c86df53e9a91.zip
Merge pull request #11846 from gaurish/jdbc-upgrade
Upgrade ActiveRecord-JDBC-Adapter to v1.3 for better compatibility with ActiveRecord 4
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile13
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 0ab41ec445..cff6ae4dec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,12 +61,13 @@ platforms :ruby do
end
platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7'
-
- group :db do
- gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7'
- gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7'
- end
+ git 'git://github.com/jruby/activerecord-jdbc-adapter.git' do
+ gem 'activerecord-jdbcsqlite3-adapter'
+ group :db do
+ gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter'
+ end
+ end
end
# gems that are necessary for ActiveRecord tests with Oracle database