Skip to content

Commit b743779

Browse files
committed
Deprecate native JRuby support
Issue: SPR-13283
1 parent d837356 commit b743779

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ configure(allprojects) { project ->
4949
ext.javamailVersion = "1.5.4"
5050
ext.jettyVersion = "9.3.1.v20150714"
5151
ext.jodaVersion = "2.8.1"
52-
ext.jrubyVersion = "1.7.21"
52+
ext.jrubyVersion = "1.7.21" // JRuby 9.0.0.0 only supported through JSR-223 (StandardScriptFactory)
5353
ext.jtaVersion = "1.2"
5454
ext.junitVersion = "4.12"
5555
ext.nettyVersion = "4.0.29.Final"

spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -38,13 +38,18 @@
3838
* see the latter's javadoc for a configuration example.
3939
*
4040
* <p>Note: Spring 4.0 supports JRuby 1.5 and higher.
41+
* As of Spring 4.2, JRuby 9.0.0.0 is supported but only through
42+
* {@link org.springframework.scripting.support.StandardScriptFactory}.
4143
*
4244
* @author Juergen Hoeller
4345
* @author Rob Harrop
4446
* @since 2.0
4547
* @see JRubyScriptUtils
4648
* @see org.springframework.scripting.support.ScriptFactoryPostProcessor
49+
* @deprecated in favor of JRuby support via the JSR-223 abstraction
50+
* ({@link org.springframework.scripting.support.StandardScriptFactory})
4751
*/
52+
@Deprecated
4853
public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
4954

5055
private final String scriptSourceLocator;

spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@
4545
* Utility methods for handling JRuby-scripted objects.
4646
*
4747
* <p>Note: Spring 4.0 supports JRuby 1.5 and higher.
48+
* As of Spring 4.2, JRuby 9.0.0.0 is supported but only through
49+
* {@link org.springframework.scripting.support.StandardScriptFactory}.
4850
*
4951
* @author Rob Harrop
5052
* @author Juergen Hoeller
5153
* @author Rick Evans
5254
* @since 2.0
55+
* @deprecated in favor of JRuby support via the JSR-223 abstraction
56+
* ({@link org.springframework.scripting.support.StandardScriptFactory})
5357
*/
58+
@Deprecated
5459
public abstract class JRubyScriptUtils {
5560

5661
/**

spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,6 @@
4444
</xsd:complexType>
4545
</xsd:element>
4646

47-
<xsd:element name="jruby">
48-
<xsd:annotation>
49-
<xsd:documentation><![CDATA[
50-
A Spring bean backed by a JRuby class definition.
51-
]]></xsd:documentation>
52-
</xsd:annotation>
53-
<xsd:complexType>
54-
<xsd:complexContent>
55-
<xsd:extension base="dynamicScriptType">
56-
<xsd:attributeGroup ref="vanillaScriptAttributes"/>
57-
</xsd:extension>
58-
</xsd:complexContent>
59-
</xsd:complexType>
60-
</xsd:element>
61-
6247
<xsd:element name="bsh">
6348
<xsd:annotation>
6449
<xsd:documentation><![CDATA[

0 commit comments

Comments
 (0)