summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)