Merge pull request #16989 from protocolbuffers/cp-27

Move back deprecation of java utf8 feature to 2024.
protocolbuffers · May 30, 2024 · 838626d · 838626d
2 parents af2ffbb + 8ffc1d0
commit 838626d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/java/core/src/main/resources/google/protobuf/java_features.proto b/java/core/src/main/resources/google/protobuf/java_features.proto
@@ -59,7 +59,7 @@ message JavaFeatures {
     // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
-      edition_deprecated: EDITION_2023,
+      edition_deprecated: EDITION_2024,
       deprecation_warning: "The Java-specific utf8 validation feature is "
                            "deprecated and is scheduled to be removed in "
                            "edition 2025.  Utf8 validation behavior should "

diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc