From faf5baeff58280df898f7d89bbb68eff0f00ccf3 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 18 Jun 2015 07:16:44 +0000 Subject: [PATCH] Merged r14329 from trunk to 2.6-stable (#19252) 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/2.6-stable@14331 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fa9442e96..a6aa285b7 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ if File.exist?(database_file) gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby when /sqlite3/ gem "sqlite3", :platforms => [:mri, :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] -- 2.39.5