Merge branch '5.3.x'

bclozel · bclozel · commit 79d3f5c64c94 · 2021-11-24T21:34:55.000+01:00
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -51,7 +51,7 @@
  *
  * <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
  * <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>
- * 
+ *
  * @author Juergen Hoeller
  * @author Mark Fisher
  * @since 2.5

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`*`
`52`	`52`	`* <pre class="code">com.xyz.FooServiceImpl -> fooServiceImpl</pre>`
`53`	`53`	`* <pre class="code">com.xyz.URLFooServiceImpl -> URLFooServiceImpl</pre>`
`54`		`- *`
	`54`	`+ *`
`55`	`55`	`* @author Juergen Hoeller`
`56`	`56`	`* @author Mark Fisher`
`57`	`57`	`* @since 2.5`