From a272fd790a8a7b86a20d81c2db1edce1df41993e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 19 Mar 2013 22:40:14 +0100 Subject: [PATCH] Clarified support for JRuby 1.5+ and Groovy 1.7+ --- .../springframework/scripting/groovy/GroovyScriptFactory.java | 4 +++- .../springframework/scripting/jruby/JRubyScriptFactory.java | 4 +++- .../org/springframework/scripting/jruby/JRubyScriptUtils.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java index e40871defb..ebc89ce257 100644 --- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -43,6 +43,8 @@ import org.springframework.util.ClassUtils; * {@link org.springframework.scripting.support.ScriptFactoryPostProcessor}; * see the latter's javadoc} for a configuration example. * + *

Note: Spring 4.0 supports Groovy 1.7 and higher. + * * @author Juergen Hoeller * @author Rob Harrop * @author Rod Johnson 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 498033617d..e4d7eeecfb 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-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -37,6 +37,8 @@ import org.springframework.util.ClassUtils; * {@link org.springframework.scripting.support.ScriptFactoryPostProcessor}; * see the latter's javadoc for a configuration example. * + *

Note: Spring 4.0 supports JRuby 1.5 and higher. + * * @author Juergen Hoeller * @author Rob Harrop * @since 2.0 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 06cff22b70..3ef0011497 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,7 +45,7 @@ import org.springframework.util.StringUtils; /** * Utility methods for handling JRuby-scripted objects. * - *

As of Spring 3.0, this class requires JRuby 1.1 or higher. + *

Note: Spring 4.0 supports JRuby 1.5 and higher. * * @author Rob Harrop * @author Juergen Hoeller