Manually migrate top-level protobuf unittest protos from edition 2023 to edition 2024.

PiperOrigin-RevId: 791221060

Author: zhangskz

cmake/tests.cmake

@@ -37,7 +37,7 @@ foreach(proto_file ${tests_protos})
     PROTOS ${proto_file}
     LANGUAGE cpp
     OUT_VAR pb_generated_files
-    IMPORT_DIRS ${protobuf_SOURCE_DIR}/src
+    IMPORT_DIRS ${protobuf_SOURCE_DIR}/src ${protobuf_SOURCE_DIR}/java/core/src/main/resources
   )
   set(tests_proto_files ${tests_proto_files} ${pb_generated_files})
 endforeach(proto_file)

csharp/generate_protos.sh

@@ -50,7 +50,7 @@ $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \
 # Note that this deliberately does *not* include old_extensions1.proto
 # and old_extensions2.proto, which are generated with an older version
 # of protoc.
-$PROTOC -Isrc -I. \
+$PROTOC -Isrc -I. -Ijava/core/src/main/resources/ \
     --experimental_allow_proto3_optional \
     --experimental_editions \
     --csharp_out=csharp/src/Google.Protobuf.Test.TestProtos \

java/core/BUILD.bazel

@@ -217,7 +217,10 @@ cc_proto_library(
 filegroup(
     name = "java_features_proto_srcs",
     srcs = ["src/main/resources/google/protobuf/java_features.proto"],
-    visibility = ["//pkg:__pkg__"],
+    visibility = [
+        "//pkg:__pkg__",
+        "//python:__pkg__",
+    ],
 )
 
 compile_edition_defaults(

python/build_targets.bzl

@@ -258,16 +258,23 @@ def build_targets(name):
     )
 
     internal_copy_files(
-        name = "copied_test_dependency_proto_files",
+        name = "copied_cpp_features_test_dependency_proto_files",
         srcs = [
             "//src/google/protobuf:cpp_features_proto_srcs",
         ],
         strip_prefix = "src",
     )
 
+    internal_copy_files(
+        name = "copied_java_features_test_dependency_proto_files",
+        srcs = [
+            "//java/core:java_features_proto_srcs",
+        ],
+        strip_prefix = "java/core/src/main/resources",
+    )
     internal_py_proto_library(
         name = "test_dependency_proto_py_pb2",
-        srcs = [":copied_test_dependency_proto_files"],
+        srcs = [":copied_cpp_features_test_dependency_proto_files", ":copied_java_features_test_dependency_proto_files"],
         include = ".",
         default_runtime = "",
         protoc = "//:protoc",

python/google/protobuf/internal/descriptor_test.py

@@ -1473,7 +1473,7 @@ class ReturnObject:
             )
         ],
         minimum_edition=descriptor_pb2.Edition.EDITION_PROTO2,
-        maximum_edition=descriptor_pb2.Edition.EDITION_2023,
+        maximum_edition=descriptor_pb2.Edition.EDITION_2024,
     )
     defaults.defaults[0].overridable_features.Extensions[
         unittest_features_pb2.test

src/google/protobuf/BUILD.bazel

@@ -1053,7 +1053,7 @@ filegroup(
     visibility = ["//:__subpackages__"],
 )
 
-proto_library(
+protobuf_test_proto_library(
     name = "test_protos",
     srcs = [
         "any_test.proto",
@@ -1095,6 +1095,10 @@ proto_library(
         "unittest_string_view.proto",
         "unittest_well_known_types.proto",
     ],
+    option_deps = [
+        ":cpp_features_proto",
+        "//:java_features_proto",
+    ],
     strip_import_prefix = "/src",
     visibility = ["//:__subpackages__"],
     deps = [
@@ -1190,9 +1194,10 @@ cc_proto_library(
     deps = [":unittest_features_proto"],
 )
 
-proto_library(
+protobuf_test_proto_library(
     name = "generic_test_protos",
     srcs = [":test_proto_srcs"],
+    option_deps = [":cpp_features_proto"],
     strip_import_prefix = "/src",
     visibility = ["//:__subpackages__"],
     deps = [
@@ -1211,9 +1216,13 @@ proto_library(
     ],
 )
 
-proto_library(
+protobuf_test_proto_library(
     name = "generic_test_editions_protos",
     srcs = [":test_proto_editions_srcs"],
+    option_deps = [
+        ":cpp_features_proto",
+        "//:java_features_proto",
+    ],
     strip_import_prefix = "/src",
     visibility = ["//:__subpackages__"],
     deps = [