Migrates some Java test protos using java_features.proto to edition 2024

PiperOrigin-RevId: 788111478

Author: zhangskz

bazel/tests/protobuf_test_proto_library.bzl

@@ -15,6 +15,6 @@ def protobuf_test_proto_library(**kwattrs):
     if "option_deps" in kwargs and hasattr(native, "proto_library"):
         deps = kwargs.pop("deps", [])
         option_deps = kwargs.pop("option_deps")
-        kwargs["deps"] = deps + option_deps
+        kwargs["deps"] = depset(deps + option_deps).to_list()
 
     proto_library(**kwargs)

java/core/BUILD.bazel

@@ -7,6 +7,10 @@ load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("//bazel:java_proto_library.bzl", "java_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
+load(
+    "//bazel/tests:protobuf_test_proto_library.bzl",
+    "protobuf_test_proto_library",
+)
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
 load("//build_defs:java_opts.bzl", "protobuf_java_export", "protobuf_java_library", "protobuf_versioned_java_library")
 load("//conformance:defs.bzl", "conformance_test")
@@ -338,9 +342,12 @@ proto_lang_toolchain(
     visibility = ["//visibility:public"],
 )
 
-proto_library(
+protobuf_test_proto_library(
     name = "java_test_protos",
     srcs = glob(["src/test/proto/**/*.proto"]),
+    option_deps = [
+        "//:java_features_proto",
+    ],
     strip_import_prefix = "src/test/proto",
     deps = [
         "//:any_proto",

java/core/src/test/proto/com/google/protobuf/large_open_enum.proto

@@ -11,7 +11,7 @@ edition = "2024";
 
 package protobuf_test_messages.edition;
 
-import "google/protobuf/java_features.proto";
+import option "google/protobuf/java_features.proto";
 
 option java_package = "com.google.protobuf.large.openenum.edition";
 option features.(pb.java).large_enum = true;

java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto

@@ -12,7 +12,7 @@ edition = "2024";
 
 package proto2_test_check_utf8;
 
-import "google/protobuf/java_features.proto";
+import option "google/protobuf/java_features.proto";
 
 option features.utf8_validation = NONE;
 option features.(pb.java).utf8_validation = VERIFY;