Skip to content

Commit 8ec8a4e

Browse files
l46kokcopybara-github
authored andcommitted
Prepare 0.14.0 release
PiperOrigin-RevId: 959884362
1 parent 2da98c9 commit 8ec8a4e

27 files changed

Lines changed: 1773 additions & 117 deletions

.github/workflows/unwanted_deps.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,8 @@ checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf
4646
# cel_runtime_android shouldn't depend on the full protobuf runtime or antlr
4747
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
4848
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:org_antlr_antlr4_runtime'
49+
50+
# cel shouldn't depend on the verifier
51+
checkUnwantedDeps '//publish:cel' '//verifier/'
52+
4953
exit 0

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ java_library(
8181
neverlink = 1,
8282
exports = [
8383
"@maven//:com_google_auto_value_auto_value_annotations",
84+
"@maven//:org_jspecify_jspecify",
8485
],
8586
)
8687

MODULE.bazel

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,41 @@ module(
1616
name = "cel_java",
1717
)
1818

19-
bazel_dep(name = "bazel_skylib", version = "1.9.0")
20-
bazel_dep(name = "rules_jvm_external", version = "6.10")
21-
bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
22-
bazel_dep(name = "googleapis", version = "0.0.0-20260223-edfe7983", repo_name = "com_google_googleapis")
19+
bazel_dep(name = "bazel_skylib", version = "1.9.2")
20+
bazel_dep(name = "rules_jvm_external", version = "7.1")
21+
bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
22+
bazel_dep(name = "googleapis", version = "0.0.0-20260728-b8486a2f", repo_name = "com_google_googleapis")
2323
bazel_dep(name = "rules_pkg", version = "1.2.0")
2424
bazel_dep(name = "rules_license", version = "1.0.0")
2525
bazel_dep(name = "rules_proto", version = "7.1.0")
26-
bazel_dep(name = "rules_java", version = "9.3.0")
27-
bazel_dep(name = "rules_android", version = "0.7.1")
28-
bazel_dep(name = "rules_shell", version = "0.6.1")
29-
bazel_dep(name = "googleapis-java", version = "1.0.0")
30-
bazel_dep(name = "cel-spec", version = "0.25.1", repo_name = "cel_spec")
31-
bazel_dep(name = "rules_go", version = "0.50.1")
26+
bazel_dep(name = "rules_java", version = "9.7.0")
27+
bazel_dep(name = "rules_android", version = "0.7.3")
28+
bazel_dep(name = "rules_shell", version = "0.8.0")
29+
bazel_dep(name = "googleapis-java", version = "1.1.5")
30+
bazel_dep(name = "cel-spec", version = "0.25.2", repo_name = "cel_spec")
31+
bazel_dep(name = "rules_go", version = "0.62.0")
3232

3333
# Required by cel-spec to satisfy gazelle transitive dependency
3434
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
35-
go_sdk.download(version = "1.23.0")
35+
go_sdk.download(version = "1.26.5")
3636

3737
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
3838
switched_rules.use_languages(java = True)
3939
use_repo(switched_rules, "com_google_googleapis_imports")
4040

4141
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
4242

43-
GUAVA_VERSION = "33.5.0"
43+
AUTO_VALUE_VERSION = "1.11.1"
4444

45-
TRUTH_VERSION = "1.4.4"
45+
GUAVA_VERSION = "33.6.0"
4646

47-
PROTOBUF_JAVA_VERSION = "4.33.5"
47+
JLINE_VERSION = "3.30.16"
4848

49-
CEL_VERSION = "0.13.1"
49+
TRUTH_VERSION = "1.4.5"
50+
51+
PROTOBUF_JAVA_VERSION = "4.35.1"
52+
53+
CEL_VERSION = "0.14.0-SNAPSHOT"
5054

5155
# Compile only artifacts
5256
[
@@ -58,7 +62,7 @@ CEL_VERSION = "0.13.1"
5862
)
5963
for group, artifact, version in [coord.split(":") for coord in [
6064
"com.google.code.findbugs:annotations:3.0.1",
61-
"com.google.errorprone:error_prone_annotations:2.42.0",
65+
"com.google.errorprone:error_prone_annotations:2.50.0",
6266
]]
6367
]
6468

@@ -72,8 +76,8 @@ CEL_VERSION = "0.13.1"
7276
)
7377
for group, artifact, version in [coord.split(":") for coord in [
7478
"org.mockito:mockito-core:4.11.0",
75-
"io.github.classgraph:classgraph:4.8.179",
76-
"com.google.testparameterinjector:test-parameter-injector:1.18",
79+
"io.github.classgraph:classgraph:4.8.186",
80+
"com.google.testparameterinjector:test-parameter-injector:1.22",
7781
"com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
7882
"com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERSION,
7983
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
@@ -86,22 +90,23 @@ maven.install(
8690
name = "maven",
8791
# keep sorted
8892
artifacts = [
89-
"com.google.auto.value:auto-value:1.11.0",
90-
"com.google.auto.value:auto-value-annotations:1.11.0",
93+
"com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
94+
"com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
9195
"com.google.guava:guava:" + GUAVA_VERSION + "-jre",
9296
"com.google.protobuf:protobuf-java:" + PROTOBUF_JAVA_VERSION,
9397
"com.google.protobuf:protobuf-java-util:" + PROTOBUF_JAVA_VERSION,
9498
"com.google.re2j:re2j:1.8",
9599
"info.picocli:picocli:4.7.7",
96100
"org.antlr:antlr4-runtime:4.13.2",
97101
"org.freemarker:freemarker:2.3.34",
98-
"org.jline:jline-reader:3.26.1",
99-
"org.jline:jline-terminal:3.26.1",
102+
"org.jline:jline-reader:" + JLINE_VERSION,
103+
"org.jline:jline-terminal:" + JLINE_VERSION,
100104
"org.jspecify:jspecify:1.0.0",
101-
"org.threeten:threeten-extra:1.8.0",
102-
"org.yaml:snakeyaml:2.5",
105+
"org.threeten:threeten-extra:1.10.0",
106+
"org.yaml:snakeyaml:2.6",
103107
"tools.aqua:z3-turnkey:4.14.1",
104108
],
109+
known_contributing_modules = ["protobuf"],
105110
repositories = [
106111
"https://maven.google.com",
107112
"https://repo1.maven.org/maven2",
@@ -129,10 +134,12 @@ maven.install(
129134
"dev.cel:compiler:" + CEL_VERSION,
130135
"dev.cel:runtime:" + CEL_VERSION,
131136
],
137+
fail_on_missing_checksum = not CEL_VERSION.endswith("-SNAPSHOT"),
132138
repositories = [
133139
"https://maven.google.com",
134140
"https://repo1.maven.org/maven2",
135141
"https://central.sonatype.com/repository/maven-snapshots/",
142+
"m2local",
136143
],
137144
)
138145
use_repo(maven, "maven", "maven_android", "maven_conformance")

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ CEL-Java is available in Maven Central Repository. [Download the JARs here][8] o
5555
<dependency>
5656
<groupId>dev.cel</groupId>
5757
<artifactId>cel</artifactId>
58-
<version>0.13.1</version>
58+
<version>0.14.0</version>
5959
</dependency>
6060
```
6161

6262
**Gradle**
6363

6464
```gradle
65-
implementation 'dev.cel:cel:0.13.1'
65+
implementation 'dev.cel:cel:0.14.0'
6666
```
6767

6868
Then run this example:

conformance/src/test/java/dev/cel/maven/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ MAVEN_RUNTIME_JAR_DEPS = [
2020
java_test(
2121
name = "compiler_artifact_test",
2222
srcs = ["CompilerArtifactTest.java"],
23+
tags = ["conformance_maven"],
2324
test_class = "dev.cel.maven.CompilerArtifactTest",
2425
deps =
2526
MAVEN_COMPILER_JAR_DEPS + [
@@ -33,6 +34,7 @@ java_test(
3334
java_test(
3435
name = "runtime_artifact_test",
3536
srcs = ["RuntimeArtifactTest.java"],
37+
tags = ["conformance_maven"],
3638
test_class = "dev.cel.maven.RuntimeArtifactTest",
3739
deps =
3840
MAVEN_RUNTIME_JAR_DEPS + [

policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,12 +712,10 @@ private enum TestErrorYamlPolicy {
712712
DUPLICATE_VARIABLE("duplicate_variable"),
713713
IMPORT("import"),
714714
INCOMPATIBLE_OUTPUTS("incompatible_outputs"),
715-
UNDECLARED_REFERENCE("undeclared_reference");
716-
// TODO: Re-enable once cel-policy OSS dependency is updated with aggregate
717-
// testdata.
718-
// AGGREGATE_ERRORS("aggregate_errors"),
719-
// AGGREGATE_LIST_ERRORS("aggregate_list_errors"),
720-
// AGGREGATE_NESTED_MIXED_SEMANTICS("aggregate_nested_mixed_semantics");
715+
UNDECLARED_REFERENCE("undeclared_reference"),
716+
AGGREGATE_ERRORS("aggregate_errors"),
717+
AGGREGATE_LIST_ERRORS("aggregate_list_errors"),
718+
AGGREGATE_NESTED_MIXED_SEMANTICS("aggregate_nested_mixed_semantics");
721719

722720
private final String name;
723721
private final String policyFilePath;

publish/BUILD.bazel

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@bazel_common//tools/maven:pom_file.bzl", "pom_file")
2-
load("@rules_jvm_external//:defs.bzl", "java_export")
2+
load("@rules_jvm_external//:defs.bzl", "java_export", "maven_export")
33
load("//publish:cel_version.bzl", "CEL_VERSION")
44

55
# Note: These targets must reference the build targets in `src` directly in
@@ -335,7 +335,7 @@ pom_file(
335335
"CEL_VERSION": CEL_VERSION,
336336
"CEL_ARTIFACT_ID": "verifier",
337337
"PACKAGE_NAME": "CEL Java Verifier",
338-
"PACKAGE_DESC": "Formal verification tools for Common Expression Language for Java.",
338+
"PACKAGE_DESC": "Formal verification library for Common Expression Language for Java.",
339339
},
340340
targets = VERIFIER_TARGETS,
341341
template_file = "pom_template.xml",
@@ -349,3 +349,22 @@ java_export(
349349
pom_template = ":cel_verifier_pom",
350350
exports = VERIFIER_TARGETS + [":cel"],
351351
)
352+
353+
pom_file(
354+
name = "cel_verifier_cli_pom",
355+
substitutions = {
356+
"CEL_VERSION": CEL_VERSION,
357+
"CEL_ARTIFACT_ID": "verifier-cli",
358+
"PACKAGE_NAME": "CEL Java Verifier CLI",
359+
"PACKAGE_DESC": "Formal verification CLI and REPL tool for Common Expression Language for Java.",
360+
},
361+
targets = [],
362+
template_file = "pom_template.xml",
363+
)
364+
365+
maven_export(
366+
name = "cel_verifier_cli",
367+
maven_coordinates = "dev.cel:verifier-cli:%s" % CEL_VERSION,
368+
pom_template = ":cel_verifier_cli_pom",
369+
target = "//verifier/src/main/java/dev/cel/verifier/tools:cel_verifier_tool_deploy.jar",
370+
)

publish/cel_version.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
"""Maven artifact version for CEL."""
15-
CEL_VERSION = "0.13.1"
15+
CEL_VERSION = "0.14.0-SNAPSHOT"

publish/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
# Note, to run script: Bazel and jq are required
2828

29-
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")
29+
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")
3030
JDK8_FLAGS="--java_language_version=8 --java_runtime_version=8"
3131

3232
function publish_maven_remote() {

repositories.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def antlr4_jar_dependency():
2424
)
2525

2626
def bazel_common_dependency():
27-
bazel_common_tag = "aaa4d801588f7744c6f4428e4f133f26b8518f42"
28-
bazel_common_sha = "1f85abb0043f3589b9bf13a80319dc48a5f01a052c68bab3c08015a56d92ab7f"
27+
bazel_common_tag = "768dbe0b3247e2e5def0b9ac6c4cde95e214f18a"
28+
bazel_common_sha = "b3f1fe7e26ade37712b00b82a0ab3760bb340e9307d57166872dacc679b78da1"
2929
http_archive(
3030
name = "bazel_common",
3131
sha256 = bazel_common_sha,
@@ -34,8 +34,8 @@ def bazel_common_dependency():
3434
)
3535

3636
def cel_policy_dependency():
37-
cel_policy_tag = "e4c38defbbf34dfff2dc448dc58e93a9733ae8b1"
38-
cel_policy_sha = "46378e0d17a16465899f9fefc94c3d44e1f40aedd8a31c9c0b2b6198048eabd6"
37+
cel_policy_tag = "57ee86fea2ca3804c7722cc089e20a92fa15f902"
38+
cel_policy_sha = "188609177ca930e8d5d2f5131b9522f345e06b8de500014b4e969e3977a7d687"
3939
http_archive(
4040
name = "cel_policy",
4141
sha256 = cel_policy_sha,

0 commit comments

Comments
 (0)