aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-17 17:12:48 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-17 17:12:48 -0700
commit364879c61e68a1090eacb65481a3555298452141 (patch)
tree5769898ac45cc6967f7a99f0509a242bf313e36a
parent03346dfae704be94cbc5648180f59ab331c077d4 (diff)
parentb2bf725d795634fb2383f3a4fa5ab5e9c61c54f1 (diff)
downloadrails-364879c61e68a1090eacb65481a3555298452141.tar.gz
rails-364879c61e68a1090eacb65481a3555298452141.tar.bz2
rails-364879c61e68a1090eacb65481a3555298452141.zip
Merge pull request #3057 from arunagw/arjdbc_bump_master
Bump AR-JDBC version.
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 5ce420c3a3..508d083fe6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,7 @@ end
platforms :jruby do
gem "ruby-debug", ">= 0.10.3"
gem "json"
- gem "activerecord-jdbcsqlite3-adapter"
+ gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
# This is needed by now to let tests work on JRuby
# TODO: When the JRuby guys merge jruby-openssl in
@@ -83,8 +83,8 @@ platforms :jruby do
gem "jruby-openssl"
group :db do
- gem "activerecord-jdbcmysql-adapter"
- gem "activerecord-jdbcpostgresql-adapter"
+ gem "activerecord-jdbcmysql-adapter", ">= 1.2.0"
+ gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0"
end
end