build: Update common-jvm dep for Maven BOMs (#1790)

Closes #1794
world-federation-of-advertisers · Sep 9, 2024 · c52d8eb · c52d8eb
1 parent 99eacf0
commit c52d8eb
Show file tree

Hide file tree

Showing 9 changed files with 5,664 additions and 19,872 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.1.0
+7.3.1
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,8 +3,6 @@ module(
     repo_name = "wfa_measurement_system",
 )
 
-PROJECTNESSIE_CEL_VERSION = "0.3.11"
-
 BORINGSSL_VERSION = "0.0.0-20230215-5c22014"
 
 # Version of Apache Beam.
@@ -18,14 +16,90 @@ APACHE_BEAM_VERSION = "2.45.0"
 
 K8S_CLIENT_VERSION = "21.0.1"
 
-# Bazel Central Registry modules.
+#  --- WFA registry modules. ---
+
+# Must come before rules_kotlin due to toolchain resolution precedence.
+# See https://github.com/bazelbuild/bazel/discussions/23075.
+bazel_dep(
+    name = "rules_kotlin_jvm",
+    version = "0.3.0",
+    repo_name = "wfa_rules_kotlin_jvm",
+)
+bazel_dep(
+    name = "rules_swig",
+    version = "0.1.0",
+    repo_name = "wfa_rules_swig",
+)
+bazel_dep(
+    name = "rules_cue",
+    version = "0.4.0",
+    repo_name = "wfa_rules_cue",
+)
+bazel_dep(
+    name = "common-jvm",
+    version = "0.91.0",
+    repo_name = "wfa_common_jvm",
+)
+bazel_dep(
+    name = "common-cpp",
+    version = "0.13.0",
+    repo_name = "wfa_common_cpp",
+)
+bazel_dep(
+    name = "cross-media-measurement-api",
+    version = "0.65.0",
+    repo_name = "wfa_measurement_proto",
+)
+bazel_dep(
+    name = "consent-signaling-client",
+    version = "0.22.0",
+    repo_name = "wfa_consent_signaling_client",
+)
+bazel_dep(
+    name = "any-sketch",
+    version = "0.9.1",
+    repo_name = "any_sketch",
+)
+bazel_dep(
+    name = "any-sketch-java",
+    version = "0.7.0",
+    repo_name = "any_sketch_java",
+)
+bazel_dep(
+    name = "googleapis",
+    version = "0.0.0-bzlmod.1",
+    repo_name = "com_google_googleapis",
+)
+bazel_dep(
+    name = "private-join-and-compute",
+    version = "0.0.0-20230417-e028e59",
+    repo_name = "com_google_private_join_and_compute",
+)
+bazel_dep(
+    name = "virtual-people-common",
+    version = "0.4.0",
+    repo_name = "wfa_virtual_people_common",
+)
+bazel_dep(
+    name = "grpc-gateway",
+    version = "2.18.1",
+    repo_name = "grpc_ecosystem_grpc_gateway",
+)
+bazel_dep(
+    name = "cloud-spanner-emulator-bin",
+    version = "1.5.23",
+    repo_name = "cloud_spanner_emulator",
+)
+
+# --- Bazel Central Registry modules. ---
+
 bazel_dep(
     name = "platforms",
-    version = "0.0.9",
+    version = "0.0.10",
 )
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.5.0",
+    version = "1.7.1",
 )
 bazel_dep(
     name = "rules_proto",
@@ -51,19 +125,19 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_java",
-    version = "7.4.0",
+    version = "7.9.1",
 )
 bazel_dep(
     name = "rules_jvm_external",
-    version = "6.0",
+    version = "6.2.bzlmod.1",
 )
 bazel_dep(
     name = "rules_python",
     version = "0.31.0",
 )
 bazel_dep(
     name = "protobuf",
-    version = "23.1",
+    version = "27.3",
     repo_name = "com_google_protobuf",
 )
 bazel_dep(
@@ -111,84 +185,11 @@ bazel_dep(
     repo_name = "com_google_riegeli",
 )
 
-# WFA registry modules.
-bazel_dep(
-    name = "rules_kotlin_jvm",
-    version = "0.2.0",
-    repo_name = "wfa_rules_kotlin_jvm",
-)
-bazel_dep(
-    name = "rules_swig",
-    version = "0.1.0",
-    repo_name = "wfa_rules_swig",
-)
-bazel_dep(
-    name = "rules_cue",
-    version = "0.4.0",
-    repo_name = "wfa_rules_cue",
-)
-bazel_dep(
-    name = "common-jvm",
-    version = "0.89.0",
-    repo_name = "wfa_common_jvm",
-)
-bazel_dep(
-    name = "common-cpp",
-    version = "0.13.0",
-    repo_name = "wfa_common_cpp",
-)
-bazel_dep(
-    name = "cross-media-measurement-api",
-    version = "0.65.0",
-    repo_name = "wfa_measurement_proto",
-)
-bazel_dep(
-    name = "consent-signaling-client",
-    version = "0.22.0",
-    repo_name = "wfa_consent_signaling_client",
-)
-bazel_dep(
-    name = "any-sketch",
-    version = "0.9.1",
-    repo_name = "any_sketch",
-)
-bazel_dep(
-    name = "any-sketch-java",
-    version = "0.7.0",
-    repo_name = "any_sketch_java",
-)
-bazel_dep(
-    name = "googleapis",
-    version = "0.0.0-bzlmod.1",
-    repo_name = "com_google_googleapis",
-)
-bazel_dep(
-    name = "private-join-and-compute",
-    version = "0.0.0-20230417-e028e59",
-    repo_name = "com_google_private_join_and_compute",
-)
-bazel_dep(
-    name = "virtual-people-common",
-    version = "0.4.0",
-    repo_name = "wfa_virtual_people_common",
-)
-bazel_dep(
-    name = "grpc-gateway",
-    version = "2.18.1",
-    repo_name = "grpc_ecosystem_grpc_gateway",
-)
-bazel_dep(
-    name = "cloud-spanner-emulator-bin",
-    version = "1.5.13",
-    repo_name = "cloud_spanner_emulator",
-)
-
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.artifact(
     artifact = "beam-runners-google-cloud-dataflow-java",
     exclusions = ["org.apache.beam:beam-sdks-java-io-kafka"],
     group = "org.apache.beam",
-    version = APACHE_BEAM_VERSION,
 )
 maven.artifact(
     artifact = "beam-sdks-java-io-google-cloud-platform",
@@ -197,33 +198,46 @@ maven.artifact(
         "io.netty:netty-tcnative-boringssl-static",
     ],
     group = "org.apache.beam",
-    version = APACHE_BEAM_VERSION,
 )
 maven.install(
     artifacts = [
-        "com.github.ben-manes.caffeine:caffeine:3.1.8",
-        "com.google.cloud:google-cloud-security-private-ca:2.3.1",
         "com.google.crypto.tink:tink-awskms:1.9.1",
         "com.google.crypto.tink:tink-gcpkms:1.9.0",
         "com.squareup.okhttp3:okhttp:4.12.0",
         "io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha",
         "io.kubernetes:client-java:" + K8S_CLIENT_VERSION,
         "io.kubernetes:client-java-extended:" + K8S_CLIENT_VERSION,
         "joda-time:joda-time:2.10.10",
-        "org.apache.beam:beam-runners-direct-java:" + APACHE_BEAM_VERSION,
-        "org.apache.beam:beam-runners-spark:" + APACHE_BEAM_VERSION,
-        "org.apache.beam:beam-sdks-java-core:" + APACHE_BEAM_VERSION,
-        "org.projectnessie.cel:cel-core:" + PROJECTNESSIE_CEL_VERSION,
-        "org.projectnessie.cel:cel-generated-pb:" + PROJECTNESSIE_CEL_VERSION,
         "org.slf4j:slf4j-simple:1.7.32",
-        "software.amazon.awssdk:acmpca:2.17.258",
+
+        # Google Cloud
+        "com.google.cloud:google-cloud-security-private-ca",
+        # TODO(googleapis/java-cloud-bom#5279): Remove when managed by BOM.
+        "com.google.apis:google-api-services-storage:v1-rev20240706-2.0.0",
+
+        # AWS
+        "software.amazon.awssdk:acmpca",
+
+        # Apache Beam
+        "org.apache.beam:beam-runners-direct-java",
+        "org.apache.beam:beam-runners-spark",
+        "org.apache.beam:beam-sdks-java-core",
+
+        # CEL
+        "org.projectnessie.cel:cel-core",
+        "org.projectnessie.cel:cel-generated-pb",
+    ],
+    boms = [
+        "org.apache.beam:beam-sdks-java-bom:" + APACHE_BEAM_VERSION,
+        "org.projectnessie.cel:cel-bom:0.5.0",
     ],
     fail_if_repin_required = True,
     fetch_sources = True,  # For IDE integration.
     lock_file = "//:maven_install.json",
+    resolver = "maven",
     strict_visibility = True,
 )
-use_repo(maven, "maven", "unpinned_maven")
+use_repo(maven, "maven")
 
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(