grpc-java-1.26.0.
grpc-core: 1.19.0 -> 1.26.0
grpc-netty: 1.19.0 -> 1.26.0
mysql-connector-java: 8.0.16 -> 8.0.19
@@ -589,11 +589,15 @@ when ($JAVA_PROTO_USE_JAVALITE) {
_JAVA_PROTO_OUT_ARG=--javalite_out
_JAVA_PROTO_ARGUMENTS=--plugin=protoc-gen-javalite=${PROTOC_GEN_JAVALITE_RESOURCE_GLOBAL}/protoc-gen-javalite-3.0.0.exe
JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-lite/3.0.1 build/external_resources/protoc-gen-javalite
+ JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
+ JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
}
otherwise {
_JAVA_PROTO_OUT_ARG=--java_out
_JAVA_PROTO_ARGUMENTS=
- JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/3.6.1
+ JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/3.11.0
+ JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.26.0
+ JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.26.0
}
macro _JAVA_PROTO_CMD(File) {
@@ -2475,7 +2479,7 @@ COMPILE_JAVA_MF=$GENERATE_VCS_JAVA_INFO_NODEP && $COMPILE_JAVA && $GENERATE_MF
### @usage: EXTERNAL_JAVA_LIBRARY() #internal
###
### EXTERNAL_JAVA_LIBRARY() is a module for creating a .jar file using non-Java code (generators etc.)
-### Unlike regular JAVA_LIBRARY this module doesn't produce .pom file, so it cannot be exported to Maven itslef.
+### Unlike regular JAVA_LIBRARY this module doesn't produce .pom file, so it cannot be exported to Maven itself.
### PEERDIR it from JAVA_LIBRARY or JAVA_PROGRAM for export to Maven.
module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
.EXTS=.jsrc .java .jar .mf
@@ -2500,9 +2504,6 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
SET(DONT_RESOLVE_INCLUDES yes)
}
-JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
-JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
-
### @usage: PY_LIBRARY()
###
### Python 2.x binary built library. Builds sources from PY_SRCS to data suitable for PY_PROGRAM.
