Specify protobuf-java dependencies from maven. Provide v1alpha1 as a separate maven artifact.

l46kok · copybara-github · commit b6835bddf124 · 2023-02-22T09:32:39.000-08:00
PiperOrigin-RevId: 511517590
diff --git a/README.md b/README.md
@@ -171,6 +171,8 @@ CEL-Java is available in Maven Central Repository. [Download the JARs here][6] o
 implementation 'dev.cel:runtime:0.1.0'
 ```
 
+Note: if you are already using `com.google.api.expr.v1alpha1` protobuf definitions, you also need to take `dev:cel:v1alpha1:0.1.0` as a dependency and leverage `CelProtoV1Alpha1AbstractSyntaxTree` class to convert your protobuf objects. Please note that v1alpha1 is now deprecated and new consumers should opt to use `dev.cel.expr` protos instead.
+
 ## Common Questions
 
 ### Why not JavaScript, Lua, or WASM?
diff --git a/WORKSPACE b/WORKSPACE
@@ -58,9 +58,10 @@ maven_install(
         "com.google.auto.value:auto-value:1.10.1",
         "com.google.auto.value:auto-value-annotations:1.10.1",
         "com.google.code.findbugs:annotations:3.0.1",
-        "com.google.code.gson:gson:2.10.1",
         "com.google.errorprone:error_prone_annotations:2.16",
         "com.google.guava:guava:31.1-jre",
+        "com.google.protobuf:protobuf-java:3.22.0",
+        "com.google.protobuf:protobuf-java-util:3.22.0",
         "com.google.re2j:re2j:1.7",
         "com.google.testparameterinjector:test-parameter-injector:1.10",
         "com.google.truth.extensions:truth-java8-extension:1.1.3",
diff --git a/common/src/main/java/dev/cel/common/BUILD.bazel b/common/src/main/java/dev/cel/common/BUILD.bazel
@@ -36,9 +36,9 @@ java_library(
         "//common/src/main/java/dev/cel/common/types:cel_types",
         "//common/src/main/java/dev/cel/common/types:type_providers",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:protobuf_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
diff --git a/common/src/main/java/dev/cel/common/ast/BUILD.bazel b/common/src/main/java/dev/cel/common/ast/BUILD.bazel
@@ -26,10 +26,9 @@ java_library(
     deps = [
         "//:auto_value",
         "//common/src/main/java/dev/cel/common/annotations",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
diff --git a/common/src/main/java/dev/cel/common/internal/BUILD.bazel b/common/src/main/java/dev/cel/common/internal/BUILD.bazel
@@ -21,10 +21,9 @@ java_library(
         "//:auto_value",
         "//common/src/main/java/dev/cel/common/annotations",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
     ],
 )
@@ -73,15 +72,10 @@ java_library(
         "//common/src/main/java/dev/cel/common/annotations",
         "//common/src/main/java/dev/cel/common/types:cel_types",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:wrappers_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",
     ],
 )
@@ -93,10 +87,9 @@ java_library(
         ":dynamic_proto",
         "//:auto_value",
         "//common/src/main/java/dev/cel/common/annotations",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:protobuf_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -108,8 +101,8 @@ java_library(
     ],
     deps = [
         "//:auto_value",
-        "@com_google_protobuf//:protobuf_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/common/src/main/java/dev/cel/common/types/BUILD.bazel b/common/src/main/java/dev/cel/common/types/BUILD.bazel
@@ -46,10 +46,8 @@ java_library(
         ":types",
         "//common/src/main/java/dev/cel/common/annotations",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -61,10 +59,8 @@ java_library(
         ":types",
         "//common/src/main/java/dev/cel/common/annotations",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -100,8 +96,8 @@ java_library(
         "//:auto_value",
         "//common/src/main/java/dev/cel/common",
         "//common/src/main/java/dev/cel/common/internal:file_descriptor_converter",
-        "@com_google_protobuf//:protobuf_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/common/src/test/java/dev/cel/common/BUILD.bazel b/common/src/test/java/dev/cel/common/BUILD.bazel
@@ -19,12 +19,8 @@ java_library(
         "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
         "@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@maven//:junit_junit",
         "@maven//:org_antlr_antlr4_runtime",
diff --git a/common/src/test/java/dev/cel/common/ast/BUILD.bazel b/common/src/test/java/dev/cel/common/ast/BUILD.bazel
@@ -11,9 +11,8 @@ java_library(
         "//common/src/main/java/dev/cel/common/ast:expr_v1alpha1_converter",
         "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
diff --git a/common/src/test/java/dev/cel/common/internal/BUILD.bazel b/common/src/test/java/dev/cel/common/internal/BUILD.bazel
@@ -20,13 +20,8 @@ java_library(
         "//common/src/test/resources:service_conflicting_name_java_proto",
         "//common/src/test/resources:single_file_java_proto",
         "@com_google_googleapis//google/type:type_java_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:wrappers_proto",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
     ],
diff --git a/publish/BUILD.bazel b/publish/BUILD.bazel
@@ -14,6 +14,7 @@ pom_file(
     name = "cel_runtime_pom",
     substitutions = {
         "CEL_VERSION": CEL_VERSION,
+        "CEL_ARTIFACT_ID": "runtime",
         "PACKAGE_NAME": "CEL Java Runtime",
         "PACKAGE_DESC": "Common Expression Language Runtime for Java",
     },
@@ -27,3 +28,26 @@ java_export(
     pom_template = ":cel_runtime_pom",
     runtime_deps = RUNTIME_TARGETS,
 )
+
+V1ALPHA1_UTILITY_TARGETS = [
+    "//common/src/main/java/dev/cel/common:proto_v1alpha1_ast",
+]
+
+pom_file(
+    name = "cel_v1alpha1_pom",
+    substitutions = {
+        "CEL_VERSION": CEL_VERSION,
+        "CEL_ARTIFACT_ID": "v1alpha1",
+        "PACKAGE_NAME": "CEL Java v1alpha1 Utility",
+        "PACKAGE_DESC": "Common Expression Language Utility for supporting v1alpha1 protobuf definitions",
+    },
+    targets = V1ALPHA1_UTILITY_TARGETS,
+    template_file = "pom_template.xml",
+)
+
+java_export(
+    name = "cel_v1alpha1",
+    maven_coordinates = "dev.cel:v1alpha1:%s" % CEL_VERSION,
+    pom_template = ":cel_v1alpha1_pom",
+    runtime_deps = V1ALPHA1_UTILITY_TARGETS,
+)
diff --git a/publish/pom_template.xml b/publish/pom_template.xml
@@ -1,50 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      https://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
+<!-- See the License for the specific language governing permissions and -->
+<!-- limitations under the License. -->
+
 <project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <artifactId>CEL_ARTIFACT_ID</artifactId>
 
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-
-  <groupId>dev.cel</groupId>
-  <artifactId>runtime</artifactId>
-  <version>CEL_VERSION</version>
-  <packaging>jar</packaging>
+  <dependencies>
+    {generated_bzl_deps}
+  </dependencies>
 
-  <name>PACKAGE_NAME</name>
   <description>
     PACKAGE_DESC
   </description>
-  <url>https://github.com/google/cel-java</url>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
   <developers>
     <developer>
-      <name>CEL Dev Team</name>
       <email>cel-dev@google.com</email>
+      <name>CEL Dev Team</name>
       <organization>Google</organization>
       <organizationUrl>https://google.com</organizationUrl>
     </developer>
   </developers>
+  <groupId>dev.cel</groupId>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <modelVersion>4.0.0</modelVersion>
+  <name>PACKAGE_NAME</name>
+  <packaging>jar</packaging>
+
+  <parent>
+    <artifactId>oss-parent</artifactId>
+    <groupId>org.sonatype.oss</groupId>
+    <version>7</version>
+  </parent>
 
   <scm>
     <connection>scm:git:git://github.com/google/cel-java.git
     </connection>
     <url>https://github.com/google/cel-java/tree/main</url>
   </scm>
 
-  <dependencies>
-    {generated_bzl_deps}
-  </dependencies>
+  <url>https://github.com/google/cel-java</url>
+
+  <version>CEL_VERSION</version>
 </project>
diff --git a/publish/publish.sh b/publish/publish.sh
@@ -24,7 +24,8 @@
 # 1. You must create a pgp certificate and upload it to keyserver.ubuntu.com. See https://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
 # 2. You will need to enter the key's password. The prompt appears in GUI, not in terminal. The publish operation will eventually timeout if the password is not entered.
 
-RUNTIME_TARGET=//publish:cel_runtime.publish
+
+ALL_TARGETS=("//publish:cel_runtime.publish" "//publish:cel_v1alpha1.publish")
 
 function publish_maven_remote() {
   maven_repo_url=$1
@@ -33,12 +34,16 @@ function publish_maven_remote() {
    # https://github.com/bazelbuild/rules_jvm_external/issues/679
    read -p "maven_user: " maven_user
    read -s -p "maven_password: " maven_password
-   bazel run --stamp \
-     --define "maven_repo=$maven_repo_url" \
-     --define gpg_sign=true \
-     --define "maven_user=$maven_user" \
-     --define "maven_password=$maven_password" \
-     $RUNTIME_TARGET
+   for PUBLISH_TARGET in "${ALL_TARGETS[@]}"
+   do
+        bazel run --stamp \
+          --define "maven_repo=$maven_repo_url" \
+          --define gpg_sign=true \
+          --define "maven_user=$maven_user" \
+          --define "maven_password=$maven_password" \
+          $PUBLISH_TARGET
+   done
+
 }
 
 version=$(<cel_version.bzl)
@@ -71,5 +76,8 @@ elif [ "$flag" == "--release" ] || [ "$flag" == "-r" ]; then
 else
  local_maven_repo=$HOME/.m2/repository
  echo "Pushing to local Maven repository $local_maven_repo"
- bazel run --define "maven_repo=file://$local_maven_repo" $RUNTIME_TARGET
+  for PUBLISH_TARGET in "${ALL_TARGETS[@]}"
+  do
+     bazel run --define "maven_repo=file://$local_maven_repo" $PUBLISH_TARGET
+  done
 fi
diff --git a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel
@@ -50,13 +50,10 @@ java_library(
         "//common/src/main/java/dev/cel/common/types",
         "//common/src/main/java/dev/cel/common/types:type_providers",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:protobuf_java_util",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
         "@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",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -80,13 +77,11 @@ java_library(
         "//common/src/main/java/dev/cel/common/internal:dynamic_proto",
         "//common/src/main/java/dev/cel/common/types:type_providers",
         "@cel_spec//proto/expr:expr_java_proto",
-        "@com_google_protobuf//:field_mask_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:protobuf_java_util",
-        "@com_google_protobuf//:struct_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//:com_google_protobuf_protobuf_java_util",
         "@maven//:org_jspecify_jspecify",
     ],
 )
@@ -105,11 +100,9 @@ java_library(
         "//common/src/main/java/dev/cel/common/internal:converter",
         "//common/src/main/java/dev/cel/common/internal:dynamic_proto",
         "//common/src/main/java/dev/cel/common/internal:proto_equality",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:protobuf_java",
-        "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_re2j_re2j",
         "@maven//:org_threeten_threeten_extra",
     ],
@@ -139,10 +132,10 @@ java_library(
         "//common/src/main/java/dev/cel/common",
         "//common/src/main/java/dev/cel/common:options",
         "//common/src/main/java/dev/cel/common/internal:dynamic_proto",
-        "@com_google_protobuf//:protobuf_java",
         "@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",
     ],
 )
diff --git a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel
