diff --git a/build.gradle b/build.gradle
index 216662d3f2c..4fd878bb734 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ configure(allprojects) { project ->
 	ext.javamailVersion      = "1.5.4"
 	ext.jettyVersion         = "9.3.1.v20150714"
 	ext.jodaVersion          = "2.8.1"
-	ext.jrubyVersion         = "1.7.21"
+	ext.jrubyVersion         = "1.7.21"  // JRuby 9.0.0.0 only supported through JSR-223 (StandardScriptFactory)
 	ext.jtaVersion           = "1.2"
 	ext.junitVersion         = "4.12"
 	ext.nettyVersion         = "4.0.29.Final"
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
index 5a7b625f673..a7fb53d4279 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,13 +38,18 @@ import org.springframework.util.ClassUtils;
  * see the latter's javadoc for a configuration example.
  *
  * <p>Note: Spring 4.0 supports JRuby 1.5 and higher.
+ * As of Spring 4.2, JRuby 9.0.0.0 is supported but only through
+ * {@link org.springframework.scripting.support.StandardScriptFactory}.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @since 2.0
  * @see JRubyScriptUtils
  * @see org.springframework.scripting.support.ScriptFactoryPostProcessor
+ * @deprecated in favor of JRuby support via the JSR-223 abstraction
+ * ({@link org.springframework.scripting.support.StandardScriptFactory})
  */
+@Deprecated
 public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 
 	private final String scriptSourceLocator;
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
index 91e9f109c2c..5825c433de0 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
@@ -45,12 +45,17 @@ import org.springframework.util.StringUtils;
  * Utility methods for handling JRuby-scripted objects.
  *
  * <p>Note: Spring 4.0 supports JRuby 1.5 and higher.
+ * As of Spring 4.2, JRuby 9.0.0.0 is supported but only through
+ * {@link org.springframework.scripting.support.StandardScriptFactory}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Rick Evans
  * @since 2.0
+ * @deprecated in favor of JRuby support via the JSR-223 abstraction
+ * ({@link org.springframework.scripting.support.StandardScriptFactory})
  */
+@Deprecated
 public abstract class JRubyScriptUtils {
 
 	/**
diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd
index 061d7c1bada..60c219019e7 100644
--- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd
@@ -44,21 +44,6 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="jruby">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	A Spring bean backed by a JRuby class definition.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="dynamicScriptType">
-					<xsd:attributeGroup ref="vanillaScriptAttributes"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
 	<xsd:element name="bsh">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[