Skip to content

Commit f844e54

Browse files
pcjpcj
authored
Merge pull request #105 from zhexuany/master
update java grpc from 1.01 to 1.4
2 parents 6e69edd + 7d505c7 commit f844e54

File tree

3 files changed

+47
-38
lines changed

3 files changed

+47
-38
lines changed

‎java/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ proto_language(
1818
"@io_grpc_grpc_context//jar",
1919
"@io_netty_netty_buffer//jar",
2020
"@io_netty_netty_codec//jar",
21+
"@io_netty_netty_codec_http//jar",
2122
"@io_netty_netty_codec_http2//jar",
2223
"@io_netty_netty_common//jar",
2324
"@io_netty_netty_handler//jar",
2425
"@io_netty_netty_resolver//jar",
2526
"@io_netty_netty_transport//jar",
2627
"@io_grpc_grpc_protobuf_lite//jar",
28+
"@com_google_instrumentation//jar",
2729
],
2830
output_to_jar = True,
2931
pb_compile_deps = [

‎java/deps.bzl

+44-38
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,20 @@ DEPS = {
3232

3333
"io_grpc_grpc_core": {
3434
"rule": "maven_jar",
35-
"artifact": "io.grpc:grpc-core:jar:1.0.1",
36-
"sha1": "dce1c939c2c6110ac571d99f8d2a29b19bdad4db",
35+
"artifact": "io.grpc:grpc-core:jar:1.4.0",
36+
"sha1": "2f7ce5529115969119bff4962ac08df6700cf5d8",
37+
},
38+
39+
"com_google_instrumentation": {
40+
"rule": "maven_jar",
41+
"artifact": "com.google.instrumentation:instrumentation-api:jar:0.4.2",
42+
"sha1": "3b548639e14ca8d8af5075acac82926266479ebf",
3743
},
3844

3945
"io_grpc_grpc_protobuf": {
4046
"rule": "maven_jar",
41-
"artifact": "io.grpc:grpc-protobuf:jar:1.0.1",
42-
"sha1": "17222b03c64a65eb05de5ab266c920fca8c90fab",
47+
"artifact": "io.grpc:grpc-protobuf:jar:1.4.0",
48+
"sha1": "8f99da3d840cb96cd655d610f771aeca4561d52d",
4349
},
4450

4551
"com_google_protobuf_protobuf_java": {
@@ -56,8 +62,8 @@ DEPS = {
5662

5763
"io_grpc_grpc_protobuf_lite": {
5864
"rule": "maven_jar",
59-
"artifact": "io.grpc:grpc-protobuf-lite:jar:1.0.1",
60-
"sha1": "b28a07b56ed2e66088221cbaf1228fa4e9669166",
65+
"artifact": "io.grpc:grpc-protobuf-lite:jar:1.4.0",
66+
"sha1": "33e08cf571fcb2bbddc0c8176f18a43703c35763",
6167
},
6268

6369
"com_google_code_gson_gson": {
@@ -68,8 +74,8 @@ DEPS = {
6874

6975
"io_grpc_grpc_stub": {
7076
"rule": "maven_jar",
71-
"artifact": "io.grpc:grpc-stub:jar:1.0.1",
72-
"sha1": "a875969bf700b0d25dc8b7febe42bfb253ca5b3b",
77+
"artifact": "io.grpc:grpc-stub:jar:1.4.0",
78+
"sha1": "840a1a94c9f6a91511644fed6b1116914acfdb90",
7379
},
7480

7581
"junit_junit_4": {
@@ -84,62 +90,62 @@ DEPS = {
8490

8591
"io_grpc_grpc_context": {
8692
"rule": "maven_jar",
87-
"artifact": "io.grpc:grpc-context:jar:1.0.1",
88-
"sha1": "9d308f2b616044ddd380866b4e6c23b5b4020963",
93+
"artifact": "io.grpc:grpc-context:jar:1.4.0",
94+
"sha1": "8cbaa53c647ecee7077d4cdaa6855f6a18a03e9d",
8995
},
9096

9197
"io_grpc_grpc_netty": {
9298
"rule": "maven_jar",
93-
"artifact": "io.grpc:grpc-netty:jar:1.0.1",
94-
"sha1": "1e4628b96434fcd6fbe519e7a3dbcc1ec5ac2c14",
99+
"artifact": "io.grpc:grpc-netty:jar:1.4.0",
100+
"sha1": "4c463ab9f4487e11417ea15187813d082eab02ea",
95101
},
96102

97103
"io_netty_netty_buffer": {
98104
"rule": "maven_jar",
99-
"artifact": "io.netty:netty-buffer:jar:4.1.3.Final",
100-
"sha1": "e507ffb52a1d134679ed244ff819a99e96782dc4",
105+
"artifact": "io.netty:netty-buffer:jar:4.1.12.Final",
106+
"sha1": "f288fd50a2d2b58bdc51591d584aeaf8b1c10378",
101107
},
102108

103109
"io_netty_netty_codec": {
104110
"rule": "maven_jar",
105-
"artifact": "io.netty:netty-codec:jar:4.1.3.Final",
106-
"sha1": "790174576b97ab75a4edafd320f9a964a5473cdb",
111+
"artifact": "io.netty:netty-codec:jar:4.1.12.Final",
112+
"sha1": "5432f42ec70c623be5dd122a9ad358b704e0338f",
107113
},
108114

109115
"io_netty_netty_codec_http": {
110116
"rule": "maven_jar",
111-
"artifact": "io.netty:netty-codec-http:jar:4.1.3.Final",
112-
"sha1": "62fdf3c43f2674a61ad761b3d164b34dbe76e6cc",
117+
"artifact": "io.netty:netty-codec-http:jar:4.1.12.Final",
118+
"sha1": "df1561ac7c455faf57c83a45af78771c3d3d0621",
113119
},
114120

115121
"io_netty_netty_codec_http2": {
116122
"rule": "maven_jar",
117-
"artifact": "io.netty:netty-codec-http2:jar:4.1.3.Final",
118-
"sha1": "4e68c878d8ae6988eb3425d4fc2c8d3eea69ff39",
123+
"artifact": "io.netty:netty-codec-http2:jar:4.1.12.Final",
124+
"sha1": "5373bd1a7b61f4620a3c421ee999f6142d8aa06d",
119125
},
120126

121127
"io_netty_netty_common": {
122128
"rule": "maven_jar",
123-
"artifact": "io.netty:netty-common:jar:4.1.3.Final",
124-
"sha1": "620faa6dd83a08eb607c9d5c077a9b4edde3056b",
129+
"artifact": "io.netty:netty-common:jar:4.1.12.Final",
130+
"sha1": "e98289fb3e657657b69d7c024dd93cf08ac7df70",
125131
},
126132

127133
"io_netty_netty_handler": {
128134
"rule": "maven_jar",
129-
"artifact": "io.netty:netty-handler:jar:4.1.3.Final",
130-
"sha1": "0fff45bdc544a4eeceb5b4c6e3e571627af9fdb6",
135+
"artifact": "io.netty:netty-handler:jar:4.1.12.Final",
136+
"sha1": "cce3dcbfa9f0832bc446b003dfb64fd7d8649655",
131137
},
132138

133139
"io_netty_netty_resolver": {
134140
"rule": "maven_jar",
135-
"artifact": "io.netty:netty-resolver:jar:4.1.3.Final",
136-
"sha1": "fe4ba2ed19e4e8667068e917665f5725ee0290ea",
141+
"artifact": "io.netty:netty-resolver:jar:4.1.12.Final",
142+
"sha1": "fbef9e485ad1aeec284124a357bf78dc3de26f11",
137143
},
138144

139145
"io_netty_netty_transport": {
140146
"rule": "maven_jar",
141-
"artifact": "io.netty:netty-transport:jar:4.1.3.Final",
142-
"sha1": "2f17fe8c5c3b3f90908ed2d0649631a11beb3904",
147+
"artifact": "io.netty:netty-transport:jar:4.1.12.Final",
148+
"sha1": "147199f4f78f12f04964a440e7b4acf5cc01bf66",
143149
},
144150

145151
# ###################
@@ -155,8 +161,8 @@ DEPS = {
155161

156162
"io_grpc_grpc_protobuf_nano": {
157163
"rule": "maven_jar",
158-
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.0.1",
159-
"sha1": "a0881f36976030d2b5a573677e7dd4752cedf760",
164+
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.4.0",
165+
"sha1": "10bc6047f5add8a1f15bea890cc94ebb3352915a",
160166
},
161167

162168
# ###################
@@ -171,8 +177,8 @@ DEPS = {
171177

172178
"io_grpc_grpc_auth": {
173179
"rule": "maven_jar",
174-
"artifact": "io.grpc:grpc-auth:jar:1.0.1",
175-
"sha1": "5e1d053277e113ed7b7c71b5c1cbc32a8b4d3a83",
180+
"artifact": "io.grpc:grpc-auth:jar:1.4.0",
181+
"sha1": "f68be9363f43a5d7d55aea4c1a43c840e6d6a253",
176182
},
177183

178184
# ######################
@@ -181,8 +187,8 @@ DEPS = {
181187

182188
"io_grpc_grpc_okhttp": {
183189
"rule": "maven_jar",
184-
"artifact": "io.grpc:grpc-okhttp:jar:1.0.1",
185-
"sha1": "3cd4e41931268eef7c1ce00a2baecba6e53cb1da",
190+
"artifact": "io.grpc:grpc-okhttp:jar:1.4.0",
191+
"sha1": "0e6c8f1caa1f618ca4285f55a7c680e5236c4ed4",
186192
},
187193

188194
"com_squareup_okhttp_okhttp": {
@@ -203,14 +209,14 @@ DEPS = {
203209

204210
"protoc_gen_grpc_java_linux_x86_64": {
205211
"rule": "http_file",
206-
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.1/protoc-gen-grpc-java-1.0.1-linux-x86_64.exe",
207-
"sha256": "00497e9da3b8a068470bdf39b43f25084d9662e1419b01c2b3d9c29292fe0303",
212+
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.4.0/protoc-gen-grpc-java-1.4.0-linux-x86_64.exe",
213+
"sha256": "7c868902ea5c177216d8240b2b68215b3d0efd044c3be27414099f8d40a3b083",
208214
},
209215

210216
"protoc_gen_grpc_java_macosx": {
211217
"rule": "http_file",
212-
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.1/protoc-gen-grpc-java-1.0.1-osx-x86_64.exe",
213-
"sha256": "cb4762ee4bde80fee5a35409474d6f177a2005e76d41590066e09be180af7781",
218+
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.4.0/protoc-gen-grpc-java-1.4.0-osx-x86_64.exe",
219+
"sha256": "8d672fe412e0ababeebbff3db01820b59d986bf2b7e5e6987b14df532c045378",
214220
},
215221

216222
}

‎java/rules.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ load("//protobuf:rules.bzl",
99
def java_proto_repositories(
1010
lang_deps = DEPS,
1111
lang_requires = [
12+
"com_google_instrumentation",
1213
"com_google_protobuf_protobuf_java",
1314
"com_google_protobuf_protobuf_java_util",
1415
"com_google_code_gson_gson",

0 commit comments

Comments
 (0)