From 8ffc1d003071df0fbdf470c38e181c61cc178fa8 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Thu, 30 May 2024 12:47:42 -0700 Subject: [PATCH] Move back deprecation of java utf8 feature to 2024. This doesn't change the support window of the feature, but will make edition 2023 slightly less noisy. PiperOrigin-RevId: 638750805 --- .../core/src/main/resources/google/protobuf/java_features.proto | 2 +- src/google/protobuf/compiler/java/java_features.pb.cc | 2 +- 2 files changed, 2 insertions(+), 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 index 075f67a113bf..72754fddf9a1 100644 --- 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 index 70da495b4773..f1e117e0e259 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -85,7 +85,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fjava_2fjava_ "nitions themselves rather than on fields" ".\022\237\002\n\017utf8_validation\030\002 \001(\0162\037.pb.JavaFea" "tures.Utf8ValidationB\344\001\210\001\001\230\001\004\230\001\001\242\001\014\022\007DEF" - "AULT\030\346\007\262\001\310\001\010\350\007\020\350\007\032\277\001The Java-specific ut" + "AULT\030\346\007\262\001\310\001\010\350\007\020\351\007\032\277\001The Java-specific ut" "f8 validation feature is deprecated and " "is scheduled to be removed in edition 20" "25. Utf8 validation behavior should use"