This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 972f2913c46e6312cdba5d4d1e2a9362db778be4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 16 15:37:40 2024 +0100

    Deprecate the internal fork of Commons Codec
---
 java/org/apache/tomcat/util/codec/binary/Base64.java       | 3 +++
 java/org/apache/tomcat/util/codec/binary/BaseNCodec.java   | 3 +++
 java/org/apache/tomcat/util/codec/binary/StringUtils.java  | 3 +++
 java/org/apache/tomcat/util/codec/binary/package-info.java | 2 ++
 webapps/docs/changelog.xml                                 | 4 +++-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index e38bf3df17..5f6fdbd7a5 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -46,7 +46,10 @@ package org.apache.tomcat.util.codec.binary;
  *
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt";>RFC 2045</a>
  * @since 1.0
+ *
+ * @deprecated Unused. This class will be removed in Tomcat 11 onwards.
  */
+@Deprecated
 public class Base64 extends BaseNCodec {
 
     /**
diff --git a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java 
b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
index 7492773fe0..2eaa78e940 100644
--- a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
+++ b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
@@ -27,7 +27,10 @@ import org.apache.tomcat.util.res.StringManager;
  * <p>
  * This class is thread-safe.
  * </p>
+ *
+ * @deprecated Unused. This class will be removed in Tomcat 11 onwards.
  */
+@Deprecated
 public abstract class BaseNCodec {
 
     protected static final StringManager sm = 
StringManager.getManager(BaseNCodec.class);
diff --git a/java/org/apache/tomcat/util/codec/binary/StringUtils.java 
b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
index ab050f3509..619964105b 100644
--- a/java/org/apache/tomcat/util/codec/binary/StringUtils.java
+++ b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
@@ -29,7 +29,10 @@ import java.nio.charset.StandardCharsets;
  * @see Charset
  * @see StandardCharsets
  * @since 1.4
+ *
+ * @deprecated Unused. This class will be removed in Tomcat 11 onwards.
  */
+@Deprecated
 public class StringUtils {
 
     /**
diff --git a/java/org/apache/tomcat/util/codec/binary/package-info.java 
b/java/org/apache/tomcat/util/codec/binary/package-info.java
index 605aeded44..c41bd15a4e 100644
--- a/java/org/apache/tomcat/util/codec/binary/package-info.java
+++ b/java/org/apache/tomcat/util/codec/binary/package-info.java
@@ -17,5 +17,7 @@
 
 /**
  * Base64 String encoding and decoding.
+ *
+ * Unused. This package will be removed in Tomcat 11 onwards.
  */
 package org.apache.tomcat.util.codec.binary;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f946c6f347..423e024c74 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,7 +141,9 @@
     <changelog>
       <update>
         Switch to using the Base64 encoder and decoder provided by the JRE
-        rather than the version provided by Commons Codec. (markt)
+        rather than the version provided by Commons Codec. The internal fork of
+        Commons Codec has been deprecated and will be removed in Tomcat 11.
+        (markt)
       </update>
     </changelog>
   </subsection>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to