aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-29 13:24:56 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-29 13:24:56 +0000
commit087fdb4ab16090af862ad09c11f2eeff30737525 (patch)
tree8fe367bbb42e3972bf3307be3e5b6373d13deaa5
parentbbc5f42d1014d0cef1b9d17ca612b2e5a2d5f731 (diff)
downloadruby-087fdb4ab16090af862ad09c11f2eeff30737525.tar.gz
* ext/psych/lib/psych_jars.rb: removed needless file required to JRuby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/psych/lib/psych_jars.rb6
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 435fc3f192..d407fd7892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 29 22:24:37 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * ext/psych/lib/psych_jars.rb: removed needless file required to JRuby.
+
Wed Jun 29 22:21:38 2016 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/ossl_ocsp.c: The "reuse" behavior of d2i_ functions does
diff --git a/ext/psych/lib/psych_jars.rb b/ext/psych/lib/psych_jars.rb
deleted file mode 100644
index bd7ea04de7..0000000000
--- a/ext/psych/lib/psych_jars.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: false
-require 'psych/versions'
-require 'psych.jar'
-
-require 'jar-dependencies'
-require_jar('org.yaml', 'snakeyaml', Psych::DEFAULT_SNAKEYAML_VERSION)