aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-31 09:33:03 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-31 09:33:03 -0700
commit2b3a8063ad862b3cdf129bd24b786f5eeadcc935 (patch)
tree1d2e9e19050674e9a838aa2ed4a8bdc5a9e18f8a /Gemfile
parent6617437ef26c27e8be99d5d086f810c5c4aaf6a0 (diff)
parent160e0786a32d9dcf62be8f7882998d11d8b6c3cf (diff)
downloadrails-2b3a8063ad862b3cdf129bd24b786f5eeadcc935.tar.gz
rails-2b3a8063ad862b3cdf129bd24b786f5eeadcc935.tar.bz2
rails-2b3a8063ad862b3cdf129bd24b786f5eeadcc935.zip
Merge pull request #12095 from kassio/upgrade-jruby-gems
Upgrade jruby dependencies
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index d703a2e404..7ac743cbd6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,12 +61,12 @@ platforms :ruby do
end
platforms :jruby do
- 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
+ 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'
end
end