From 27e43e59efbfcd23a6c843f0f83877f40784e24a Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Mon, 5 Aug 2024 15:02:12 -0400
Subject: [PATCH] Removes Base64Utils.java and updates spring-security-rsa to
 1.1.5

---
 spring-cloud-commons-dependencies/pom.xml     |   2 +-
 .../org/springframework/util/Base64Utils.java | 133 ------------------
 2 files changed, 1 insertion(+), 134 deletions(-)
 delete mode 100644 spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java

diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml
index 9cc3e198..bef42e6f 100644
--- a/spring-cloud-commons-dependencies/pom.xml
+++ b/spring-cloud-commons-dependencies/pom.xml
@@ -15,7 +15,7 @@
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
 	<properties>
-		<spring-security-rsa.version>1.1.3</spring-security-rsa.version>
+		<spring-security-rsa.version>1.1.5</spring-security-rsa.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java
deleted file mode 100644
index f8f4ee3c..00000000
--- a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2002-2023 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import java.util.Base64;
-
-/**
- * A simple utility class for Base64 encoding and decoding.
- *
- * <p>
- * Adapts to Java 8's {@link java.util.Base64} in a convenience fashion.
- *
- * @author Juergen Hoeller
- * @author Gary Russell
- * @since 4.1
- * @see java.util.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 {
-
-	/**
-	 * Base64-encode the given byte array.
-	 * @param src the original byte array
-	 * @return the encoded byte array
-	 */
-	public static byte[] encode(byte[] src) {
-		if (src.length == 0) {
-			return src;
-		}
-		return Base64.getEncoder().encode(src);
-	}
-
-	/**
-	 * Base64-decode the given byte array.
-	 * @param src the encoded byte array
-	 * @return the original byte array
-	 */
-	public static byte[] decode(byte[] src) {
-		if (src.length == 0) {
-			return src;
-		}
-		return Base64.getDecoder().decode(src);
-	}
-
-	/**
-	 * Base64-encode the given byte array using the RFC 4648 "URL and Filename Safe
-	 * Alphabet".
-	 * @param src the original byte array
-	 * @return the encoded byte array
-	 * @since 4.2.4
-	 */
-	public static byte[] encodeUrlSafe(byte[] src) {
-		if (src.length == 0) {
-			return src;
-		}
-		return Base64.getUrlEncoder().encode(src);
-	}
-
-	/**
-	 * Base64-decode the given byte array using the RFC 4648 "URL and Filename Safe
-	 * Alphabet".
-	 * @param src the encoded byte array
-	 * @return the original byte array
-	 * @since 4.2.4
-	 */
-	public static byte[] decodeUrlSafe(byte[] src) {
-		if (src.length == 0) {
-			return src;
-		}
-		return Base64.getUrlDecoder().decode(src);
-	}
-
-	/**
-	 * Base64-encode the given byte array to a String.
-	 * @param src the original byte array
-	 * @return the encoded byte array as a UTF-8 String
-	 */
-	public static String encodeToString(byte[] src) {
-		if (src.length == 0) {
-			return "";
-		}
-		return Base64.getEncoder().encodeToString(src);
-	}
-
-	/**
-	 * Base64-decode the given byte array from a UTF-8 String.
-	 * @param src the encoded UTF-8 String
-	 * @return the original byte array
-	 */
-	public static byte[] decodeFromString(String src) {
-		if (src.isEmpty()) {
-			return new byte[0];
-		}
-		return Base64.getDecoder().decode(src);
-	}
-
-	/**
-	 * Base64-encode the given byte array to a String using the RFC 4648 "URL and Filename
-	 * Safe Alphabet".
-	 * @param src the original byte array
-	 * @return the encoded byte array as a UTF-8 String
-	 */
-	public static String encodeToUrlSafeString(byte[] src) {
-		return Base64.getUrlEncoder().encodeToString(src);
-	}
-
-	/**
-	 * Base64-decode the given byte array from a UTF-8 String using the RFC 4648 "URL and
-	 * Filename Safe Alphabet".
-	 * @param src the encoded UTF-8 String
-	 * @return the original byte array
-	 */
-	public static byte[] decodeFromUrlSafeString(String src) {
-		return Base64.getUrlDecoder().decode(src);
-	}
-
-}