change dependency on dev.cel:cel

Author: shivaspeaks

MODULE.bazel

@@ -21,8 +21,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.re2j:re2j:1.8",
     "com.google.s2a.proto.v2:s2a-proto:0.1.3",
     "com.google.truth:truth:1.4.5",
-    "dev.cel:runtime:0.11.1",
-    "dev.cel:compiler:0.11.1",
+    "dev.cel:cel:0.11.1",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
     "io.netty:netty-buffer:4.1.130.Final",

gradle/libs.versions.toml

@@ -34,8 +34,7 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
 # checkstyle 10.0+ requires Java 11+
 # See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0
 # checkForUpdates: checkstylejava8:9.+
-cel-runtime = "dev.cel:runtime:0.11.1"
-cel-compiler = "dev.cel:compiler:0.11.1"
+cel = "dev.cel:cel:0.11.1"
 checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
 commons-math3 = "org.apache.commons:commons-math3:3.6.1"
 conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"

repositories.bzl

@@ -25,8 +25,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.re2j:re2j:1.8",
     "com.google.s2a.proto.v2:s2a-proto:0.1.3",
     "com.google.truth:truth:1.4.5",
-    "dev.cel:runtime:0.11.1",
-    "dev.cel:compiler:0.11.1",
+    "dev.cel:cel:0.11.1",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
     "io.netty:netty-buffer:4.1.130.Final",

xds/BUILD.bazel

@@ -41,8 +41,7 @@ java_library(
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
         artifact("com.google.re2j:re2j"),
-        artifact("dev.cel:runtime"),
-        artifact("dev.cel:compiler"),
+        artifact("dev.cel:cel"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),
         artifact("io.netty:netty-common"),
@@ -103,6 +102,8 @@ JAR_JAR_RULES = [
     "rule io.envoyproxy.** io.grpc.xds.shaded.io.envoyproxy.@1",
     "rule udpa.annotations.** io.grpc.xds.shaded.udpa.annotations.@1",
     "rule xds.annotations.** io.grpc.xds.shaded.xds.annotations.@1",
+    "rule dev.cel.** io.grpc.xds.shaded.dev.cel.@1",
+    "rule cel.** io.grpc.xds.shaded.cel.@1",
 ]
 
 jar_jar(

xds/build.gradle

@@ -56,10 +56,7 @@ dependencies {
             libraries.re2j,
             libraries.auto.value.annotations,
             libraries.protobuf.java.util
-    implementation(libraries.cel.runtime) {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    implementation(libraries.cel.compiler) {
+    implementation(libraries.cel) {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
     def nettyDependency = implementation project(':grpc-netty')