Skip to content

Commit 9410caf

Browse files
Revert "xds: CEL implementation (#12770)" (#12823)
This reverts commit ecbe721 because of problems encountered with importing to google3: xds_prod is marked as compatible with non-prod and it can't depend on cel which isn't marked as such.
1 parent a6916c9 commit 9410caf

15 files changed

Lines changed: 0 additions & 1557 deletions

MODULE.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2020
"com.google.re2j:re2j:1.8",
2121
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
2222
"com.google.truth:truth:1.4.5",
23-
"dev.cel:runtime:0.12.0",
24-
"dev.cel:protobuf:0.12.0",
25-
"dev.cel:common:0.12.0",
2623
"com.squareup.okhttp:okhttp:2.7.5",
2724
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2825
"io.netty:netty-buffer:4.1.133.Final",

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ subprojects {
4343
ignoreGradleMetadataRedirection()
4444
}
4545
}
46-
maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
4746
}
4847

4948
tasks.withType(JavaCompile).configureEach {

gradle/libs.versions.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
3737
# checkstyle 10.0+ requires Java 11+
3838
# See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0
3939
# checkForUpdates: checkstylejava8:9.+
40-
cel-runtime = "dev.cel:runtime:0.12.0"
41-
cel-protobuf = "dev.cel:protobuf:0.12.0"
42-
cel-compiler = "dev.cel:compiler:0.12.0"
4340
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
4441
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
4542
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"

repositories.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2525
"com.google.re2j:re2j:1.8",
2626
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
2727
"com.google.truth:truth:1.4.5",
28-
"dev.cel:runtime:0.12.0",
29-
"dev.cel:protobuf:0.12.0",
30-
"dev.cel:common:0.12.0",
3128
"com.squareup.okhttp:okhttp:2.7.5",
3229
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
3330
"io.netty:netty-buffer:4.1.133.Final",

xds/BUILD.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ java_library(
4141
artifact("com.google.errorprone:error_prone_annotations"),
4242
artifact("com.google.guava:guava"),
4343
artifact("com.google.re2j:re2j"),
44-
artifact("dev.cel:runtime"),
45-
artifact("dev.cel:protobuf"),
46-
artifact("dev.cel:common"),
4744
artifact("io.netty:netty-buffer"),
4845
artifact("io.netty:netty-codec"),
4946
artifact("io.netty:netty-common"),
@@ -100,8 +97,6 @@ JAR_JAR_RULES = [
10097
"rule com.google.api.expr.** io.grpc.xds.shaded.com.google.api.expr.@1",
10198
"rule com.google.security.** io.grpc.xds.shaded.com.google.security.@1",
10299
"rule dev.cel.expr.** io.grpc.xds.shaded.dev.cel.expr.@1",
103-
"rule dev.cel.** io.grpc.xds.shaded.dev.cel.@1",
104-
"rule cel.** io.grpc.xds.shaded.cel.@1",
105100
"rule envoy.annotations.** io.grpc.xds.shaded.envoy.annotations.@1",
106101
"rule io.envoyproxy.** io.grpc.xds.shaded.io.envoyproxy.@1",
107102
"rule udpa.annotations.** io.grpc.xds.shaded.udpa.annotations.@1",

xds/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,11 @@ dependencies {
5656
libraries.re2j,
5757
libraries.auto.value.annotations,
5858
libraries.protobuf.java.util
59-
implementation(libraries.cel.runtime) {
60-
exclude group: 'com.google.protobuf', module: 'protobuf-java'
61-
}
62-
implementation(libraries.cel.protobuf) {
63-
exclude group: 'com.google.protobuf', module: 'protobuf-java'
64-
}
6559
def nettyDependency = implementation project(':grpc-netty')
6660

6761
testImplementation project(':grpc-api')
6862
testImplementation project(':grpc-rls')
6963
testImplementation project(':grpc-inprocess')
70-
testImplementation libraries.cel.compiler
7164
testImplementation testFixtures(project(':grpc-core')),
7265
testFixtures(project(':grpc-api')),
7366
testFixtures(project(':grpc-util'))
@@ -182,15 +175,13 @@ tasks.named("javadoc").configure {
182175
exclude 'io/grpc/xds/XdsNameResolverProvider.java'
183176
exclude 'io/grpc/xds/internal/**'
184177
exclude 'io/grpc/xds/Internal*'
185-
exclude 'dev/cel/**'
186178
}
187179

188180
def prefixName = 'io.grpc.xds'
189181
tasks.named("shadowJar").configure {
190182
archiveClassifier = null
191183
dependencies {
192184
include(project(':grpc-xds'))
193-
include(dependency('dev.cel:.*'))
194185
}
195186
// Relocated packages commonly need exclusions in jacocoTestReport and javadoc
196187
// Keep in sync with BUILD.bazel's JAR_JAR_RULES
@@ -207,8 +198,6 @@ tasks.named("shadowJar").configure {
207198
// TODO: missing java_package option in .proto
208199
relocate 'udpa.annotations', "${prefixName}.shaded.udpa.annotations"
209200
relocate 'xds.annotations', "${prefixName}.shaded.xds.annotations"
210-
relocate 'dev.cel', "${prefixName}.shaded.dev.cel"
211-
relocate 'cel', "${prefixName}.shaded.cel"
212201
exclude "**/*.proto"
213202
}
214203

xds/src/main/java/io/grpc/xds/internal/matcher/CelCommon.java

Lines changed: 0 additions & 134 deletions
This file was deleted.

xds/src/main/java/io/grpc/xds/internal/matcher/CelStringExtractor.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)