Merge branch '6.0.x'

2023-06-07 12:01:54 +02:00
parent df7223f39c f2ae106c32
commit 714d380ec0
5 changed files with 11 additions and 7 deletions
--- a/spring-core/src/main/java/org/springframework/util/Base64Utils.java
+++ b/spring-core/src/main/java/org/springframework/util/Base64Utils.java
@@ -27,7 +27,8 @@ import java.util.Base64;
 * @author Gary Russell
 * @since 4.1
 * @see java.util.Base64
- * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}.
+ * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled
+ * for removal in 6.2
 */
@Deprecated(since = "6.0.5", forRemoval = true)
 public abstract class Base64Utils {