Skip to content

Commit a1fbd6c

Browse files
mortenmjfmeum
mortenmj
and
fmeum
authored
Add grpc-java 1.68.1 (#3448)
Co-authored-by: Fabian Meumertzheim <[email protected]>
1 parent 2846e40 commit a1fbd6c

File tree

5 files changed

+253
-1
lines changed

5 files changed

+253
-1
lines changed

‎modules/grpc-java/1.68.1/MODULE.bazel‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
module(
2+
name = "grpc-java",
3+
compatibility_level = 0,
4+
repo_name = "io_grpc_grpc_java",
5+
version = "1.68.1", # CURRENT_GRPC_VERSION
6+
)
7+
8+
# GRPC_DEPS_START
9+
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
10+
"com.google.android:annotations:4.1.1.4",
11+
"com.google.api.grpc:proto-google-common-protos:2.29.0",
12+
"com.google.auth:google-auth-library-credentials:1.23.0",
13+
"com.google.auth:google-auth-library-oauth2-http:1.23.0",
14+
"com.google.auto.value:auto-value-annotations:1.11.0",
15+
"com.google.auto.value:auto-value:1.11.0",
16+
"com.google.code.findbugs:jsr305:3.0.2",
17+
"com.google.code.gson:gson:2.11.0",
18+
"com.google.errorprone:error_prone_annotations:2.28.0",
19+
"com.google.guava:failureaccess:1.0.1",
20+
"com.google.guava:guava:33.2.1-android",
21+
"com.google.j2objc:j2objc-annotations:3.0.0",
22+
"com.google.re2j:re2j:1.7",
23+
"com.google.truth:truth:1.4.2",
24+
"com.squareup.okhttp:okhttp:2.7.5",
25+
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
26+
"io.netty:netty-buffer:4.1.110.Final",
27+
"io.netty:netty-codec-http2:4.1.110.Final",
28+
"io.netty:netty-codec-http:4.1.110.Final",
29+
"io.netty:netty-codec-socks:4.1.110.Final",
30+
"io.netty:netty-codec:4.1.110.Final",
31+
"io.netty:netty-common:4.1.110.Final",
32+
"io.netty:netty-handler-proxy:4.1.110.Final",
33+
"io.netty:netty-handler:4.1.110.Final",
34+
"io.netty:netty-resolver:4.1.110.Final",
35+
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
36+
"io.netty:netty-tcnative-classes:2.0.65.Final",
37+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
38+
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
39+
"io.netty:netty-transport:4.1.110.Final",
40+
"io.opencensus:opencensus-api:0.31.0",
41+
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
42+
"io.perfmark:perfmark-api:0.27.0",
43+
"junit:junit:4.13.2",
44+
"org.apache.tomcat:annotations-api:6.0.53",
45+
"org.checkerframework:checker-qual:3.12.0",
46+
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
47+
]
48+
# GRPC_DEPS_END
49+
50+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
51+
bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240819-fe8ba054a")
52+
# CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x
53+
bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0")
54+
bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.66.0.bcr.2")
55+
bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
56+
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
57+
bazel_dep(name = "rules_cc", version = "0.0.9")
58+
bazel_dep(name = "rules_java", version = "5.3.5")
59+
bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0")
60+
bazel_dep(name = "rules_jvm_external", version = "6.0")
61+
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
62+
63+
non_module_deps = use_extension("//:repositories.bzl", "grpc_java_repositories_extension")
64+
65+
use_repo(
66+
non_module_deps,
67+
"com_github_cncf_xds",
68+
"envoy_api",
69+
)
70+
71+
grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext")
72+
73+
use_repo(
74+
grpc_repo_deps_ext,
75+
"com_envoyproxy_protoc_gen_validate",
76+
"opencensus_proto",
77+
)
78+
79+
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
80+
81+
maven.install(
82+
artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
83+
repositories = [
84+
"https://repo.maven.apache.org/maven2/",
85+
],
86+
strict_visibility = True,
87+
)
88+
89+
use_repo(maven, "maven")
90+
91+
maven.override(
92+
coordinates = "com.google.protobuf:protobuf-java",
93+
target = "@com_google_protobuf//:protobuf_java",
94+
)
95+
96+
maven.override(
97+
coordinates = "com.google.protobuf:protobuf-java-util",
98+
target = "@com_google_protobuf//:protobuf_java_util",
99+
)
100+
101+
maven.override(
102+
coordinates = "com.google.protobuf:protobuf-javalite",
103+
target = "@com_google_protobuf//:protobuf_javalite",
104+
)
105+
106+
maven.override(
107+
coordinates = "io.grpc:grpc-alts",
108+
target = "@io_grpc_grpc_java//alts",
109+
)
110+
111+
maven.override(
112+
coordinates = "io.grpc:grpc-api",
113+
target = "@io_grpc_grpc_java//api",
114+
)
115+
116+
maven.override(
117+
coordinates = "io.grpc:grpc-auth",
118+
target = "@io_grpc_grpc_java//auth",
119+
)
120+
121+
maven.override(
122+
coordinates = "io.grpc:grpc-census",
123+
target = "@io_grpc_grpc_java//census",
124+
)
125+
126+
maven.override(
127+
coordinates = "io.grpc:grpc-context",
128+
target = "@io_grpc_grpc_java//context",
129+
)
130+
131+
maven.override(
132+
coordinates = "io.grpc:grpc-core",
133+
target = "@io_grpc_grpc_java//core:core_maven",
134+
)
135+
136+
maven.override(
137+
coordinates = "io.grpc:grpc-googleapis",
138+
target = "@io_grpc_grpc_java//googleapis",
139+
)
140+
141+
maven.override(
142+
coordinates = "io.grpc:grpc-grpclb",
143+
target = "@io_grpc_grpc_java//grpclb",
144+
)
145+
146+
maven.override(
147+
coordinates = "io.grpc:grpc-inprocess",
148+
target = "@io_grpc_grpc_java//inprocess",
149+
)
150+
151+
maven.override(
152+
coordinates = "io.grpc:grpc-netty",
153+
target = "@io_grpc_grpc_java//netty",
154+
)
155+
156+
maven.override(
157+
coordinates = "io.grpc:grpc-netty-shaded",
158+
target = "@io_grpc_grpc_java//netty:shaded_maven",
159+
)
160+
161+
maven.override(
162+
coordinates = "io.grpc:grpc-okhttp",
163+
target = "@io_grpc_grpc_java//okhttp",
164+
)
165+
166+
maven.override(
167+
coordinates = "io.grpc:grpc-protobuf",
168+
target = "@io_grpc_grpc_java//protobuf",
169+
)
170+
171+
maven.override(
172+
coordinates = "io.grpc:grpc-protobuf-lite",
173+
target = "@io_grpc_grpc_java//protobuf-lite",
174+
)
175+
176+
maven.override(
177+
coordinates = "io.grpc:grpc-rls",
178+
target = "@io_grpc_grpc_java//rls",
179+
)
180+
181+
maven.override(
182+
coordinates = "io.grpc:grpc-services",
183+
target = "@io_grpc_grpc_java//services:services_maven",
184+
)
185+
186+
maven.override(
187+
coordinates = "io.grpc:grpc-stub",
188+
target = "@io_grpc_grpc_java//stub",
189+
)
190+
191+
maven.override(
192+
coordinates = "io.grpc:grpc-testing",
193+
target = "@io_grpc_grpc_java//testing",
194+
)
195+
196+
maven.override(
197+
coordinates = "io.grpc:grpc-xds",
198+
target = "@io_grpc_grpc_java//xds:xds_maven",
199+
)
200+
201+
maven.override(
202+
coordinates = "io.grpc:grpc-util",
203+
target = "@io_grpc_grpc_java//util",
204+
)
205+
206+
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
207+
208+
switched_rules.use_languages(java = True)

‎modules/grpc-java/1.68.1/patches/module_dot_bazel.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/MODULE.bazel b/MODULE.bazel
2+
index 5408f5d8b..84e1c4758 100644
3+
--- a/MODULE.bazel
4+
+++ b/MODULE.bazel
5+
@@ -18,6 +18,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
6+
"com.google.errorprone:error_prone_annotations:2.28.0",
7+
"com.google.guava:failureaccess:1.0.1",
8+
"com.google.guava:guava:33.2.1-android",
9+
+ "com.google.j2objc:j2objc-annotations:3.0.0",
10+
"com.google.re2j:re2j:1.7",
11+
"com.google.truth:truth:1.4.2",
12+
"com.squareup.okhttp:okhttp:2.7.5",
13+
@@ -47,10 +48,10 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
14+
# GRPC_DEPS_END
15+
16+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
17+
-bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
18+
+bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240819-fe8ba054a")
19+
# CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x
20+
bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0")
21+
-bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.bcr.1")
22+
+bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.66.0.bcr.2")
23+
bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
24+
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
25+
bazel_dep(name = "rules_cc", version = "0.0.9")

‎modules/grpc-java/1.68.1/presubmit.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
matrix:
2+
platform: ["debian10", "macos", "ubuntu2004", "windows"]
3+
bazel: ["7.x", "8.x"]
4+
tasks:
5+
verify_targets:
6+
platform: ${{ platform }}
7+
bazel: ${{ bazel }}
8+
build_targets:
9+
- '@grpc-java//:java_grpc_library__external_repo_test'

‎modules/grpc-java/1.68.1/source.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-QWzEJwCPW27YBpWhNTvMQabWz6dg6nqIWOYkTv0bLuA=",
3+
"strip_prefix": "grpc-java-1.68.1",
4+
"url": "https://github.com/grpc/grpc-java/archive/refs/tags/v1.68.1.tar.gz",
5+
"patch_strip": 1,
6+
"patches": {
7+
"module_dot_bazel.patch": "sha256-37ZCdssIB40VdIIUtKWTEZBNN7cykWDN//8FyaC3OSo="
8+
}
9+
}

‎modules/grpc-java/metadata.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"1.62.2",
1414
"1.64.0",
1515
"1.66.0",
16-
"1.67.1"
16+
"1.67.1",
17+
"1.68.1"
1718
],
1819
"yanked_versions": {}
1920
}

0 commit comments

Comments
 (0)