Include verifier and verifier-cli as publishable maven artifacts

.github/workflows/unwanted_deps.sh

@@ -46,4 +46,8 @@ checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf
 # cel_runtime_android shouldn't depend on the full protobuf runtime or antlr
 checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
 checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:org_antlr_antlr4_runtime'
+
+# cel shouldn't depend on the verifier
+checkUnwantedDeps '//publish:cel' '//verifier/'
+
 exit 0

publish/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@bazel_common//tools/maven:pom_file.bzl", "pom_file")
-load("@rules_jvm_external//:defs.bzl", "java_export")
+load("@rules_jvm_external//:defs.bzl", "java_export", "maven_export")
 load("//publish:cel_version.bzl", "CEL_VERSION")
 
 # Note: These targets must reference the build targets in `src` directly in
@@ -349,3 +349,22 @@ java_export(
     pom_template = ":cel_verifier_pom",
     exports = VERIFIER_TARGETS + [":cel"],
 )
+
+pom_file(
+    name = "cel_verifier_cli_pom",
+    substitutions = {
+        "CEL_VERSION": CEL_VERSION,
+        "CEL_ARTIFACT_ID": "verifier-cli",
+        "PACKAGE_NAME": "CEL Java Verifier CLI",
+        "PACKAGE_DESC": "Formal verification CLI and REPL tool for Common Expression Language for Java.",
+    },
+    targets = [],
+    template_file = "pom_template.xml",
+)
+
+maven_export(
+    name = "cel_verifier_cli",
+    maven_coordinates = "dev.cel:verifier-cli:%s" % CEL_VERSION,
+    pom_template = ":cel_verifier_cli_pom",
+    target = "//verifier/src/main/java/dev/cel/verifier/tools:cel_verifier_tool_deploy.jar",
+)

publish/publish.sh

@@ -26,7 +26,7 @@
 
 # Note, to run script: Bazel and jq are required
 
-ALL_TARGETS=("//publish:cel_common.publish" "//publish:cel.publish" "//publish:cel_compiler.publish" "//publish:cel_runtime.publish" "//publish:cel_v1alpha1.publish" "//publish:cel_protobuf.publish" "//publish:cel_runtime_android.publish")
+ALL_TARGETS=("//publish:cel_common.publish" "//publish:cel.publish" "//publish:cel_compiler.publish" "//publish:cel_runtime.publish" "//publish:cel_v1alpha1.publish" "//publish:cel_protobuf.publish" "//publish:cel_runtime_android.publish" "//publish:cel_verifier.publish" "//publish:cel_verifier_cli.publish")
 JDK8_FLAGS="--java_language_version=8 --java_runtime_version=8"
 
 function publish_maven_remote() {

verifier/BUILD.bazel

@@ -61,3 +61,10 @@ java_library(
     visibility = [":verifier_internal"],
     exports = ["//verifier/src/main/java/dev/cel/verifier:z3_impl"],
 )
+
+java_library(
+    name = "canonicalization_optimizer",
+    compatible_with = [],
+    visibility = [":verifier_internal"],
+    exports = ["//verifier/src/main/java/dev/cel/verifier:canonicalization_optimizer"],
+)

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

@@ -35,6 +35,12 @@ java_library(
     deps = [
         ":verifier",
         ":z3_impl",
+        "//bundle:cel",
+        "//checker:checker_builder",
+        "//compiler",
+        "//compiler:compiler_builder",
+        "//parser:parser_builder",
+        "//runtime",
     ],
 )
 
@@ -119,6 +125,29 @@ java_library(
     ],
 )
 
+java_library(
+    name = "canonicalization_optimizer",
+    srcs = ["CanonicalizationOptimizer.java"],
+    tags = [
+    ],
+    deps = [
+        "//:auto_value",
+        "//bundle:cel",
+        "//common:cel_ast",
+        "//common:mutable_ast",
+        "//common:mutable_source",
+        "//common:operator",
+        "//common/ast",
+        "//common/ast:mutable_expr",
+        "//common/navigation:common",
+        "//common/navigation:mutable_navigation",
+        "//common/values:cel_byte_string",
+        "//optimizer:ast_optimizer",
+        "//optimizer:mutable_ast",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
 java_library(
     name = "z3_impl",
     srcs = [
@@ -135,10 +164,12 @@ java_library(
     tags = [
     ],
     deps = [
+        ":canonicalization_optimizer",
         ":numeric_bounds",
         ":type_system",
         ":verifier",
         "//:auto_value",
+        "//bundle:cel",
         "//common:cel_ast",
         "//common:compiler_common",
         "//common:operator",
@@ -147,6 +178,9 @@ java_library(
         "//common/types",
         "//common/types:cel_types",
         "//common/types:type_providers",
+        "//optimizer",
+        "//optimizer:optimization_exception",
+        "//optimizer:optimizer_builder",
         "//verifier/axioms",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",