From beb9fa2b8b1b540e538ce40a315e734bfedfd2fd Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 22 Nov 2022 21:18:34 +0100 Subject: [PATCH] Add since attribute to Deprecated annotation Also retaining standard Java parameter names for Spring's AspectJ sources now. See gh-29531 --- spring-aspects/spring-aspects.gradle | 6 ++++++ .../core/LocalVariableTableParameterNameDiscoverer.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle index bd4e49ff638b..b9ebcf86e0a0 100644 --- a/spring-aspects/spring-aspects.gradle +++ b/spring-aspects/spring-aspects.gradle @@ -11,10 +11,16 @@ sourceSets.test.java.srcDirs = files() compileAspectj { sourceCompatibility "17" targetCompatibility "17" + ajcOptions { + compilerArgs += "-parameters" + } } compileTestAspectj { sourceCompatibility "17" targetCompatibility "17" + ajcOptions { + compilerArgs += "-parameters" + } } dependencies { diff --git a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java index 8b194cf72d95..8f6b3d83ffda 100644 --- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java @@ -54,8 +54,9 @@ * @author Sam Brannen * @since 2.0 * @deprecated as of 6.0.1, in favor of {@link StandardReflectionParameterNameDiscoverer} + * (with the "-parameters" compiler flag) */ -@Deprecated +@Deprecated(since = "6.0.1") public class LocalVariableTableParameterNameDiscoverer implements ParameterNameDiscoverer { private static final Log logger = LogFactory.getLog(LocalVariableTableParameterNameDiscoverer.class);