From 1bcff510b150b240e4ec943c92d178c94f83d1f2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 8 Dec 2012 09:22:46 +0000 Subject: [PATCH] Don't use jruby-openssl with JRuby 1.7.0 (#12228). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10955 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 97f6d989c..586373f4d 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,8 @@ platforms :mri_19, :mingw_19 do end platforms :jruby do - gem "jruby-openssl" + # jruby-openssl is bundled with JRuby 1.7.0 + gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' group :mysql do gem "activerecord-jdbcmysql-adapter" -- 2.39.5