Revert "setup a convention to boot psych.rb (similar to MRI) wout loading JI"

kares · kares · commit a70ecc6dc9f8 · 2018-06-01T15:05:06.000+02:00
This reverts commit 98e97ba.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1761,21 +1761,13 @@ private void initBuiltins() {
             addLazyBuiltin("net/protocol.rb", "net/protocol", "org.jruby.ext.net.protocol.NetProtocolBufferedIOLibrary");
         }
 
-        addBuiltinIfAllowed("win32ole.jar", (runtime, wrap) -> runtime.getLoadService().require("jruby/win32ole/stub"));
-
-        addLazyBuiltin("cgi/escape.jar", "cgi/escape", "org.jruby.ext.cgi.escape.CGIEscape");
-
-        addBuiltinIfAllowed("2.5/psych.jar", (runtime, wrap) -> { // from psych.rb (-> booted by RGs)
-            runtime.getLoadService().require("psych_jars");
-            final Library library;
-            try {
-                library = (Library) Class.forName("org.jruby.ext.psych.PsychLibrary", true, runtime.getJRubyClassLoader()).newInstance();
+        addBuiltinIfAllowed("win32ole.jar", new Library() {
+            public void load(Ruby runtime, boolean wrap) throws IOException {
+                runtime.getLoadService().require("jruby/win32ole/stub");
             }
-            catch (ClassNotFoundException|InstantiationException|IllegalAccessException ex) {
-                Helpers.throwException(ex); throw new AssertionError(); // not reached
-            }
-            library.load(runtime, false);
         });
+
+        addLazyBuiltin("cgi/escape.jar", "cgi/escape", "org.jruby.ext.cgi.escape.CGIEscape");
     }
 
     private void initRubyKernel() {
