From c18f2a379eae297972dd1be528398ee5aa293a5c Mon Sep 17 00:00:00 2001 From: Steven Parkes Date: Fri, 23 Feb 2024 14:32:01 -0800 Subject: [PATCH 1/2] don't include protos (and some other dependencies) in jars --- publish/BUILD.bazel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/publish/BUILD.bazel b/publish/BUILD.bazel index 6f8cc71a0..5259bf4fc 100644 --- a/publish/BUILD.bazel +++ b/publish/BUILD.bazel @@ -75,6 +75,9 @@ java_export( maven_coordinates = "dev.cel:cel:%s" % CEL_VERSION, pom_template = ":cel_pom", runtime_deps = ALL_TARGETS, + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], ) pom_file( From c61a0ba8077b9de9a95275c83c95fdfc6b46d7e2 Mon Sep 17 00:00:00 2001 From: Steven Parkes Date: Fri, 23 Feb 2024 16:53:54 -0800 Subject: [PATCH 2/2] move attribute location; add to other java_export targets --- publish/BUILD.bazel | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/publish/BUILD.bazel b/publish/BUILD.bazel index 5259bf4fc..9042cf250 100644 --- a/publish/BUILD.bazel +++ b/publish/BUILD.bazel @@ -72,12 +72,12 @@ pom_file( java_export( name = "cel", - maven_coordinates = "dev.cel:cel:%s" % CEL_VERSION, - pom_template = ":cel_pom", - runtime_deps = ALL_TARGETS, deploy_env = [ "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" ], + maven_coordinates = "dev.cel:cel:%s" % CEL_VERSION, + pom_template = ":cel_pom", + runtime_deps = ALL_TARGETS, ) pom_file( @@ -94,6 +94,9 @@ pom_file( java_export( name = "cel_compiler", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:compiler:%s" % CEL_VERSION, pom_template = ":cel_compiler_pom", runtime_deps = COMPILER_TARGETS, @@ -113,6 +116,9 @@ pom_file( java_export( name = "cel_runtime", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:runtime:%s" % CEL_VERSION, pom_template = ":cel_runtime_pom", runtime_deps = RUNTIME_TARGETS, @@ -132,6 +138,9 @@ pom_file( java_export( name = "cel_extensions", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:extensions:%s" % CEL_VERSION, pom_template = ":cel_extensions_pom", runtime_deps = EXTENSION_TARGETS, @@ -151,6 +160,9 @@ pom_file( java_export( name = "cel_validators", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:validators:%s" % CEL_VERSION, pom_template = ":cel_validators_pom", runtime_deps = VALIDATOR_TARGETS, @@ -170,6 +182,9 @@ pom_file( java_export( name = "cel_optimizers", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:optimizers:%s" % CEL_VERSION, pom_template = ":cel_optimizers_pom", runtime_deps = OPTIMIZER_TARGETS, @@ -189,6 +204,9 @@ pom_file( java_export( name = "cel_v1alpha1", + deploy_env = [ + "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto" + ], maven_coordinates = "dev.cel:v1alpha1:%s" % CEL_VERSION, pom_template = ":cel_v1alpha1_pom", runtime_deps = V1ALPHA1_UTILITY_TARGETS,