From 1bcff510b150b240e4ec943c92d178c94f83d1f2 2012-12-08 09:22:46
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2012-12-08 09:22:46
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

---

diff --git a/Gemfile b/Gemfile
index 97f6d98..586373f 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"