Fix CEL-Java to be fully protobuf v4 compatible

.bazelrc

@@ -0,0 +1,3 @@
+build --cxxopt=-std=c++14
+build --host_cxxopt=-std=c++14
+common --noenable_bzlmod

WORKSPACE

@@ -73,20 +73,20 @@ maven_install(
         "com.google.auto.value:auto-value:1.11.0",
         "com.google.auto.value:auto-value-annotations:1.11.0",
         "com.google.code.findbugs:annotations:3.0.1",
-        "com.google.errorprone:error_prone_annotations:2.30.0",
-        "com.google.guava:guava:33.3.0-jre",
-        "com.google.guava:guava-testlib:33.3.0-jre",
-        "com.google.protobuf:protobuf-java:4.28.0",
-        "com.google.protobuf:protobuf-java-util:4.28.0",
+        "com.google.errorprone:error_prone_annotations:2.33.0",
+        "com.google.guava:guava:33.3.1-jre",
+        "com.google.guava:guava-testlib:33.3.1-jre",
+        "com.google.protobuf:protobuf-java:4.28.2",
+        "com.google.protobuf:protobuf-java-util:4.28.2",
         "com.google.re2j:re2j:1.7",
-        "com.google.testparameterinjector:test-parameter-injector:1.15",
-        "com.google.truth.extensions:truth-java8-extension:1.4.2",
-        "com.google.truth.extensions:truth-proto-extension:1.4.2",
-        "com.google.truth:truth:1.4.2",
+        "com.google.testparameterinjector:test-parameter-injector:1.18",
+        "com.google.truth.extensions:truth-java8-extension:1.4.4",
+        "com.google.truth.extensions:truth-proto-extension:1.4.4",
+        "com.google.truth:truth:1.4.4",
         "org.antlr:antlr4-runtime:" + ANTLR4_VERSION,
         "org.jspecify:jspecify:1.0.0",
         "org.threeten:threeten-extra:1.8.0",
-        "org.yaml:snakeyaml:2.2",
+        "org.yaml:snakeyaml:2.3",
     ],
     repositories = [
         "https://maven.google.com",
@@ -96,9 +96,9 @@ maven_install(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "13e7749c30bc24af6ee93e092422f9dc08491c7097efa69461f88eb5f61805ce",
-    strip_prefix = "protobuf-28.0",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v28.0.tar.gz"],
+    sha256 = "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db",
+    strip_prefix = "protobuf-28.2",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v28.2.tar.gz"],
 )
 
 # Required by com_google_protobuf

bundle/src/main/java/dev/cel/bundle/BUILD.bazel

@@ -39,10 +39,10 @@ java_library(
         "//parser:macro",
         "//parser:parser_builder",
         "//runtime",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )

bundle/src/test/java/dev/cel/bundle/BUILD.bazel

@@ -33,14 +33,14 @@ java_library(
         "//parser:macro",
         "//runtime",
         "//runtime:unknown_attributes",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/test/v1/proto2:test_all_types_java_proto",
         "@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@com_google_googleapis//google/type:type_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_guava_guava_testlib",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:com_google_truth_extensions_truth_proto_extension",

checker/src/main/java/dev/cel/checker/BUILD.bazel

@@ -52,10 +52,10 @@ java_library(
         "//common/types",
         "//common/types:cel_types",
         "//common/types:type_providers",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -84,10 +84,10 @@ java_library(
         "//common/types:cel_types",
         "//common/types:message_type_provider",
         "//common/types:type_providers",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -103,9 +103,9 @@ java_library(
         "//common:compiler_common",
         "//common:options",
         "//common/types:type_providers",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -116,9 +116,9 @@ java_library(
     ],
     deps = [
         "//:auto_value",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -184,10 +184,10 @@ java_library(
         "//common/types:type_providers",
         "//parser:macro",
         "//parser:operator",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )

checker/src/test/java/dev/cel/checker/BUILD.bazel

@@ -11,7 +11,7 @@ java_library(
     srcs = glob(["*Test.java"]),
     resources = ["//checker/src/test/resources:baselines"],
     deps = [
-        "@@protobuf~//java/core",
+        "@maven//:com_google_protobuf_protobuf_java",
         #         "//java/com/google/testing/testsize:annotations",
         "//:auto_value",
         "//checker",

codelab/src/main/codelab/BUILD.bazel

@@ -35,9 +35,9 @@ java_library(
         "//validator/validators:homogeneous_literal",  # unuseddeps: keep
         "//validator/validators:regex",  # unuseddeps: keep
         "//validator/validators:timestamp",  # unuseddeps: keep
-        "@@protobuf~//java/core",  # unuseddeps: keep
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",  # unuseddeps: keep
         "@maven//:com_google_guava_guava",  # unuseddeps: keep
+        "@maven//:com_google_protobuf_protobuf_java",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java_util",  # unuseddeps: keep
     ],
 )

codelab/src/main/codelab/solutions/BUILD.bazel

@@ -35,9 +35,9 @@ java_library(
         "//validator/validators:homogeneous_literal",
         "//validator/validators:regex",
         "//validator/validators:timestamp",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
     ],
 )

codelab/src/test/codelab/BUILD.bazel

@@ -29,9 +29,9 @@ java_test(
         "//codelab",
         "//common",
         "//common/types",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
@@ -60,9 +60,9 @@ java_test(
         "//:java_truth",
         "//codelab",
         "//common",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
@@ -93,9 +93,9 @@ java_test(
         "//:java_truth",
         "//codelab",
         "//common",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",

codelab/src/test/codelab/solutions/BUILD.bazel

@@ -27,9 +27,9 @@ java_test(
         "//codelab:solutions",
         "//common",
         "//common/types",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
@@ -56,9 +56,9 @@ java_test(
         "//:java_truth",
         "//codelab:solutions",
         "//common",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
@@ -87,9 +87,9 @@ java_test(
         "//:java_truth",
         "//codelab:solutions",
         "//common",
-        "@@protobuf~//java/core",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",

common/src/main/java/dev/cel/common/BUILD.bazel

@@ -60,10 +60,10 @@ java_library(
         "//common/types",
         "//common/types:cel_types",
         "//common/types:type_providers",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -193,9 +193,9 @@ java_library(
     tags = [
     ],
     deps = [
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
     ],
 )

common/src/main/java/dev/cel/common/ast/BUILD.bazel

@@ -48,9 +48,9 @@ java_library(
     deps = [
         "//:auto_value",
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -98,8 +98,8 @@ java_library(
     deps = [
         ":ast",
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -42,9 +42,9 @@ java_library(
         "//:auto_value",
         "//common/annotations",
         "//common/ast",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
     ],
 )
@@ -105,8 +105,8 @@ java_library(
     ],
     deps = [
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -126,11 +126,11 @@ java_library(
         "//common:proto_json_adapter",
         "//common:runtime_exception",
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -144,9 +144,9 @@ java_library(
         ":dynamic_proto",
         "//:auto_value",
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -160,9 +160,9 @@ java_library(
     ],
     deps = [
         "//:auto_value",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -184,8 +184,8 @@ java_library(
     ],
     deps = [
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -199,7 +199,7 @@ java_library(
         ":default_instance_message_factory",
         ":proto_message_factory",
         "//common/annotations",
-        "@@protobuf~//java/core",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -210,9 +210,9 @@ java_library(
     ],
     deps = [
         ":cel_descriptor_pools",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -225,9 +225,9 @@ java_library(
         ":well_known_proto",
         "//common",
         "//common/annotations",
-        "@@protobuf~//java/core",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )