From b1cd508016f27ebcf3d21557a42f6d1afeffb434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Thu, 30 Oct 2025 14:42:41 +0100 Subject: [PATCH] Deprecate the BeanShell scripting support Closes gh-35720 --- .../org/springframework/scripting/bsh/BshScriptEvaluator.java | 2 ++ .../org/springframework/scripting/bsh/BshScriptFactory.java | 2 ++ .../java/org/springframework/scripting/bsh/BshScriptUtils.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptEvaluator.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptEvaluator.java index d9a6d32b0f4..e95671fea98 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptEvaluator.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptEvaluator.java @@ -35,7 +35,9 @@ import org.springframework.scripting.ScriptSource; * @author Juergen Hoeller * @since 4.0 * @see Interpreter#eval(String) + * @deprecated with no replacement as not actively maintained anymore */ +@Deprecated(since = "7.0") public class BshScriptEvaluator implements ScriptEvaluator, BeanClassLoaderAware { private @Nullable ClassLoader classLoader; diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java index c34d878e376..e9e068644a4 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java @@ -42,7 +42,9 @@ import org.springframework.util.ReflectionUtils; * @since 2.0 * @see BshScriptUtils * @see org.springframework.scripting.support.ScriptFactoryPostProcessor + * @deprecated with no replacement as not actively maintained anymore */ +@Deprecated(since = "7.0") public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware { private final String scriptSourceLocator; diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java index 6f66399f6ca..ccab95a5006 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java @@ -38,7 +38,9 @@ import org.springframework.util.ReflectionUtils; * @author Rob Harrop * @author Juergen Hoeller * @since 2.0 + * @deprecated with no replacement as not actively maintained anymore */ +@Deprecated(since = "7.0") public abstract class BshScriptUtils { /**