This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new d212f6554b Bump grpc.version from 1.57.2 to 1.58.0 (#13037)
d212f6554b is described below
commit d212f6554b5a4cb0afac19c8f79c3c3d7e610277
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Sep 12 12:29:11 2023 +0800
Bump grpc.version from 1.57.2 to 1.58.0 (#13037)
* Bump grpc.version from 1.57.2 to 1.58.0
Bumps `grpc.version` from 1.57.2 to 1.58.0.
Updates `io.grpc:grpc-core` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-stub` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-protobuf` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-context` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-netty-shaded` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-netty` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
Updates `io.grpc:grpc-grpclb` from 1.57.2 to 1.58.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.57.2...v1.58.0)
---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-stub
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-protobuf
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-context
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-netty-shaded
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-netty
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-grpclb
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix compile
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Albumen Kevin <[email protected]>
---
dubbo-dependencies-bom/pom.xml | 2 +-
.../apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index a5433f24a2..e6a72a9d08 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -149,7 +149,7 @@
<tomcat_embed_version>8.5.87</tomcat_embed_version>
<jetcd_version>0.7.6</jetcd_version>
<nacos_version>2.2.4</nacos_version>
- <grpc.version>1.57.2</grpc.version>
+ <grpc.version>1.58.0</grpc.version>
<grpc_contrib_verdion>0.8.1</grpc_contrib_verdion>
<jprotoc_version>1.2.2</jprotoc_version>
<!-- Log libs -->
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
index 1c8a4146db..99225b0316 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
@@ -175,7 +175,7 @@ public class IstioCitadelCertificateSigner implements
XdsCertificateSigner {
IstioCertificateServiceGrpc.IstioCertificateServiceStub stub =
IstioCertificateServiceGrpc.newStub(channel);
- stub = MetadataUtils.attachHeaders(stub, header);
+ stub =
stub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header));
CountDownLatch countDownLatch = new CountDownLatch(1);
StringBuffer publicKeyBuilder = new StringBuffer();