]> source.dussan.org Git - redmine.git/commitdiff
Merged r14329 from trunk to 3.0-stable (#19252)
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 18 Jun 2015 07:13:50 +0000 (07:13 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 18 Jun 2015 07:13:50 +0000 (07:13 +0000)
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.

sqlite-jdbc was updated to 3.8.10.1 in upstream.
https://github.com/jruby/activerecord-jdbc-adapter/commit/f7a20b0d577fad569d6f375d3b8f1e63dd02266b

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14330 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 60988302f5a6894189a8484b723a91347f86ff5b..8855d15899d7030aa76642b980f84133625113fe 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ if File.exist?(database_file)
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
         gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
-        gem "jdbc-sqlite3", "< 3.8", :platforms => :jruby
+        gem "jdbc-sqlite3", ">= 3.8.10.1", :platforms => :jruby
         gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
       when /sqlserver/
         gem "tiny_tds", "~> 0.6.2", :platforms => [:mri, :mingw, :x64_mingw]