Skip to content

Commit

Permalink
Merge pull request #15777 from wtlucy/grpc_update_1.35
Browse files Browse the repository at this point in the history 
update grpc dependencies to 1.35.0
  • Loading branch information
@wtlucy
wtlucy authored Feb 4, 2021
2 parents 27ef158 + ba78e05 commit ecfcd5f
Show file tree
Hide file tree
Showing 24 changed files with 289 additions and 687 deletions.
180 changes: 90 additions & 90 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@
<artifactId>docker-java-transport</artifactId>
<version>3.2.7</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down Expand Up @@ -424,7 +429,42 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<version>1.31.1</version>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
Expand Down Expand Up @@ -461,20 +501,65 @@
<artifactId>jaeger-tracerresolver</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.51.Final</version>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.52.Final</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>0.27.0</version>
<version>0.28.0</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<version>0.27.0</version>
<version>0.28.0</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
Expand Down Expand Up @@ -504,7 +589,7 @@
<dependency>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
<version>0.22.0</version>
<version>0.23.0</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
Expand Down Expand Up @@ -3096,11 +3181,6 @@
<artifactId>classmate</artifactId>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down Expand Up @@ -3211,91 +3291,11 @@
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.31.1</version>
</dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-core</artifactId>
<version>0.34.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.51.Final</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
Expand Down
27 changes: 22 additions & 5 deletions dev/cnf/oss_dependencies.maven
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.2
com.github.docker-java:docker-java-api:3.2.7
com.github.docker-java:docker-java-transport-zerodep:3.2.7
com.github.docker-java:docker-java-transport:3.2.7
com.google.api.grpc:proto-google-common-protos:2.0.1
com.google.code.gson:gson:2.8.6
com.google.errorprone:error_prone_annotations:2.4.0
com.google.inject:guice:2.0
Expand Down Expand Up @@ -80,23 +81,39 @@ httpunit:httpunit:1.5.4
httpunit:httpunit:1.6.2
httpunit:httpunit:1.7
io.dropwizard.metrics:metrics-core:4.1.5
io.grpc:grpc-api:1.31.1
io.grpc:grpc-api:1.35.0
io.grpc:grpc-census:1.35.0
io.grpc:grpc-context:1.35.0
io.grpc:grpc-core:1.35.0
io.grpc:grpc-netty:1.35.0
io.grpc:grpc-protobuf-lite:1.35.0
io.grpc:grpc-protobuf:1.35.0
io.grpc:grpc-stub:1.35.0
io.jaegertracing:jaeger-client:0.34.0
io.jaegertracing:jaeger-client:1.2.0
io.jaegertracing:jaeger-core:1.2.0
io.jaegertracing:jaeger-thrift:0.34.0
io.jaegertracing:jaeger-thrift:1.2.0
io.jaegertracing:jaeger-tracerresolver:0.34.0
io.jaegertracing:jaeger-tracerresolver:1.2.0
io.netty:netty-common:4.1.51.Final
io.opencensus:opencensus-api:0.27.0
io.opencensus:opencensus-contrib-grpc-metrics:0.27.0
io.netty:netty-buffer:4.1.52.Final
io.netty:netty-codec-http2:4.1.52.Final
io.netty:netty-codec-http:4.1.52.Final
io.netty:netty-codec-socks:4.1.52.Final
io.netty:netty-codec:4.1.52.Final
io.netty:netty-common:4.1.52.Final
io.netty:netty-handler-proxy:4.1.52.Final
io.netty:netty-handler:4.1.52.Final
io.netty:netty-resolver:4.1.52.Final
io.netty:netty-transport:4.1.52.Final
io.opencensus:opencensus-api:0.28.0
io.opencensus:opencensus-contrib-grpc-metrics:0.28.0
io.opentracing:opentracing-api:0.30.0
io.opentracing:opentracing-mock:0.30.0
io.opentracing:opentracing-mock:0.31.0
io.opentracing:opentracing-mock:0.33.0
io.opentracing:opentracing-util:0.30.0
io.perfmark:perfmark-api:0.22.0
io.perfmark:perfmark-api:0.23.0
io.projectreactor:reactor-core:3.1.8.RELEASE
io.reactivex.rxjava2:rxjava:2.2.19
io.reactivex:rxjava:1.3.8
Expand Down
17 changes: 0 additions & 17 deletions dev/cnf/oss_source_dependencies.maven
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
com.fasterxml.jackson.core:jackson-databind:2.11.2
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2
com.fasterxml:classmate:1.3.4
com.google.api.grpc:proto-google-common-protos:1.18.1
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.2.4
com.google.code.gson:gson:2.8.2
Expand All @@ -24,23 +23,7 @@ commons-discovery:commons-discovery:0.2
commons-fileupload:commons-fileupload:1.3.3
commons-httpclient:commons-httpclient:3.1
commons-io:commons-io:2.6
io.grpc:grpc-census:1.31.1
io.grpc:grpc-context:1.31.1
io.grpc:grpc-core:1.31.1
io.grpc:grpc-netty:1.31.1
io.grpc:grpc-protobuf-lite:1.31.1
io.grpc:grpc-protobuf:1.31.1
io.grpc:grpc-stub:1.31.1
io.jaegertracing:jaeger-core:0.34.0
io.netty:netty-buffer:4.1.51.Final
io.netty:netty-codec-http2:4.1.51.Final
io.netty:netty-codec-http:4.1.51.Final
io.netty:netty-codec-socks:4.1.51.Final
io.netty:netty-codec:4.1.51.Final
io.netty:netty-handler-proxy:4.1.51.Final
io.netty:netty-handler:4.1.51.Final
io.netty:netty-resolver:4.1.51.Final
io.netty:netty-transport:4.1.51.Final
io.opentracing:opentracing-api:0.31.0
io.opentracing:opentracing-api:0.33.0
io.opentracing:opentracing-noop:0.31.0
Expand Down
2 changes: 1 addition & 1 deletion ....websphere.appserver.features/visibility/private/io.openliberty.internal.grpc-1.0.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ IBM-API-Package: \
Subsystem-Name: gRPC internal 1.0
-bundles=\
io.openliberty.grpc.1.0.internal.common, \
io.openliberty.io.grpc.1.0; location:="dev/api/stable/,lib/"; mavenCoordinates="io.grpc:grpc-api:1.31.1"
io.openliberty.io.grpc.1.0; location:="dev/api/stable/,lib/"; mavenCoordinates="io.grpc:grpc-api:1.35.0"
-features=\
com.ibm.websphere.appserver.artifact-1.0, \
com.ibm.websphere.appserver.classloading-1.0, \
Expand Down
19 changes: 10 additions & 9 deletions dev/com.ibm.ws.grpc_fat/bnd.bnd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
#*******************************************************************************
-include= ~../cnf/resources/bnd/bundle.props
bVersion=1.0
nettyVersion=4.1.51
grpcVersion=1.35.0
nettyVersion=4.1.52

src: \
fat/src,\
Expand Down Expand Up @@ -42,14 +43,14 @@ tested.features:\
com.ibm.websphere.org.eclipse.microprofile.rest.client.1.4;version=latest,\
com.ibm.ws.org.apache.httpcomponents;version=latest, \
com.ibm.ws.org.slf4j.api.1.7.7,\
io.grpc:grpc-api;version=1.31.1,\
io.grpc:grpc-census;version=1.31.1,\
io.grpc:grpc-context;version=1.31.1,\
io.grpc:grpc-core;version=1.31.1,\
io.grpc:grpc-netty;version=1.31.1,\
io.grpc:grpc-protobuf;version=1.31.1,\
io.grpc:grpc-protobuf-lite;version=1.31.1,\
io.grpc:grpc-stub;version=1.31.1,\
io.grpc:grpc-api;version=${grpcVersion},\
io.grpc:grpc-census;version=${grpcVersion},\
io.grpc:grpc-context;version=${grpcVersion},\
io.grpc:grpc-core;version=${grpcVersion},\
io.grpc:grpc-netty;version=${grpcVersion},\
io.grpc:grpc-protobuf;version=${grpcVersion},\
io.grpc:grpc-protobuf-lite;version=${grpcVersion},\
io.grpc:grpc-stub;version=${grpcVersion},\
io.netty:netty-buffer;version=${nettyVersion},\
io.netty:netty-codec;version=${nettyVersion},\
io.netty:netty-codec-http;version=${nettyVersion},\
Expand Down
Loading

0 comments on commit ecfcd5f

Please sign in to comment.