From 6d1406b6b95742e1348b204bc1bb8021b9b04b96 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 5 Nov 2025 10:49:28 +0100 Subject: [PATCH 1/5] Add JavaInfo loading to protobuf.bzl --- bazel/protobuf.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl index 1a41f682f..bb5eede4b 100644 --- a/bazel/protobuf.bzl +++ b/bazel/protobuf.bzl @@ -1,6 +1,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_runtime_toolchain", "find_java_toolchain") load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo") +load("@rules_java//java/common:java_info.bzl", "JavaInfo") # Borrowed from https://github.com/grpc/grpc-java/blob/v1.28.0/java_grpc_library.bzl#L59 # "repository" here is for Bazel builds that span multiple WORKSPACES. From 7e037e778c41180e5f3067e31e8de10e5cce5b9d Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 5 Nov 2025 10:01:34 +0000 Subject: [PATCH 2/5] fix --- bazel/protobuf.bzl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl index bb5eede4b..d131bd6dd 100644 --- a/bazel/protobuf.bzl +++ b/bazel/protobuf.bzl @@ -1,6 +1,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_runtime_toolchain", "find_java_toolchain") +load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_toolchain") load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo") +load("@rules_java//java/common:java_common.bzl", "java_common") load("@rules_java//java/common:java_info.bzl", "JavaInfo") # Borrowed from https://github.com/grpc/grpc-java/blob/v1.28.0/java_grpc_library.bzl#L59 From dacdc503dbc0a735dd4a343cd32c1df7d1607d8d Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 5 Nov 2025 10:44:20 +0000 Subject: [PATCH 3/5] Add MODULE.bazel --- MODULE.bazel | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 MODULE.bazel diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 000000000..2b615f03e --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,92 @@ +module( + name = "protoc-gen-validate", + version = "1.2.1.bcr.1", + compatibility_level = 1, + repo_name = "com_envoyproxy_protoc_gen_validate", +) + +bazel_dep( + name = "bazel_skylib", + version = "1.7.1", +) +bazel_dep( + name = "gazelle", + version = "0.37.0", + repo_name = "bazel_gazelle", +) +bazel_dep( + name = "protobuf", + version = "29.0", + repo_name = "com_google_protobuf", +) +bazel_dep( + name = "re2", + version = "2023-09-01", + repo_name = "com_googlesource_code_re2", +) +bazel_dep( + name = "rules_cc", + version = "0.1.1", +) +bazel_dep( + name = "rules_go", + version = "0.48.0", + repo_name = "io_bazel_rules_go", +) +bazel_dep( + name = "rules_java", + version = "8.14.0", +) +bazel_dep( + name = "rules_proto", + version = "7.0.2", +) +bazel_dep( + name = "rules_python", + version = "0.40.0", +) +# -- bazel_dep definitions -- # + +go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") +go_sdk.download(version = "1.24.0") + +go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") +go_deps.from_file(go_mod = "//:go.mod") +use_repo( + go_deps, + "com_github_iancoleman_strcase", + "com_github_lyft_protoc_gen_star_v2", + "org_golang_google_protobuf", + "org_golang_x_net", +) + +PYTHON_VERSIONS = [ + "3.9", + "3.10", + "3.11", + "3.12", + "3.13", +] + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") + +[ + python.toolchain( + is_default = python_version == PYTHON_VERSIONS[-1], + python_version = python_version, + ) + for python_version in PYTHON_VERSIONS +] + +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") + +[ + pip.parse( + hub_name = "pgv_pip_deps", + python_version = python_version, + requirements_lock = "//python:requirements.txt", + ) + for python_version in PYTHON_VERSIONS +] + +use_repo(pip, "pgv_pip_deps") From 41e92f451019c05fa9833dbe7c276371f93eb5e7 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 5 Nov 2025 11:12:32 +0000 Subject: [PATCH 4/5] ugprade versions --- MODULE.bazel | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2b615f03e..19d2d6c78 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,43 +7,43 @@ module( bazel_dep( name = "bazel_skylib", - version = "1.7.1", + version = "1.8.1", ) bazel_dep( name = "gazelle", - version = "0.37.0", + version = "0.46.0", repo_name = "bazel_gazelle", ) bazel_dep( name = "protobuf", - version = "29.0", + version = "33.0", repo_name = "com_google_protobuf", ) bazel_dep( name = "re2", - version = "2023-09-01", + version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2", ) bazel_dep( name = "rules_cc", - version = "0.1.1", + version = "0.2.13", ) bazel_dep( name = "rules_go", - version = "0.48.0", + version = "0.58.3", repo_name = "io_bazel_rules_go", ) bazel_dep( name = "rules_java", - version = "8.14.0", + version = "8.16.1", ) bazel_dep( name = "rules_proto", - version = "7.0.2", + version = "7.1.0", ) bazel_dep( name = "rules_python", - version = "0.40.0", + version = "1.6.0", ) # -- bazel_dep definitions -- # From 89df4904ac786e4e4248c8a73a1f20f6071c24a5 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 5 Nov 2025 11:23:08 +0000 Subject: [PATCH 5/5] Remove version --- MODULE.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 19d2d6c78..10ee7b763 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,5 @@ module( name = "protoc-gen-validate", - version = "1.2.1.bcr.1", compatibility_level = 1, repo_name = "com_envoyproxy_protoc_gen_validate", )