Browse Source

YARN-10042. Upgrade grpc-xxx depdencies to 1.26.0. Contributed by Sheng Liu.

Zhankun Tang 5 years ago
parent
commit
12722ab0c7
2 changed files with 9 additions and 8 deletions
  1. 7 6
      LICENSE-binary
  2. 2 2
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml

+ 7 - 6
LICENSE-binary

@@ -254,12 +254,13 @@ commons-lang:commons-lang:2.6
 commons-logging:commons-logging:1.1.3
 commons-logging:commons-logging:1.1.3
 commons-net:commons-net:3.6
 commons-net:commons-net:3.6
 de.ruedigermoeller:fst:2.50
 de.ruedigermoeller:fst:2.50
-io.grpc:grpc-context:1.15.1
-io.grpc:grpc-core:1.15.1
-io.grpc:grpc-netty:1.15.1
-io.grpc:grpc-protobuf:1.15.1
-io.grpc:grpc-protobuf-lite:1.15.1
-io.grpc:grpc-stub:1.15.1
+io.grpc:grpc-api:1.26.0
+io.grpc:grpc-context:1.26.0
+io.grpc:grpc-core:1.26.0
+io.grpc:grpc-netty:1.26.0
+io.grpc:grpc-protobuf:1.26.0
+io.grpc:grpc-protobuf-lite:1.26.0
+io.grpc:grpc-stub:1.26.0
 io.netty:netty:3.10.6.Final
 io.netty:netty:3.10.6.Final
 io.netty:netty-all:4.0.52.Final
 io.netty:netty-all:4.0.52.Final
 io.netty:netty-all:4.1.27.Final
 io.netty:netty-all:4.1.27.Final

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml

@@ -28,7 +28,7 @@
     <properties>
     <properties>
         <protobuf.version>3.6.1</protobuf.version>
         <protobuf.version>3.6.1</protobuf.version>
         <guava.version>20.0</guava.version>
         <guava.version>20.0</guava.version>
-        <grpc.version>1.15.1</grpc.version>
+        <grpc.version>1.26.0</grpc.version>
         <netty-all.version>4.1.27.Final</netty-all.version>
         <netty-all.version>4.1.27.Final</netty-all.version>
         <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
         <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
     </properties>
     </properties>
@@ -152,7 +152,7 @@
                 <configuration>
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}</protocArtifact>
                     <protocArtifact>com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.15.1:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.26.0:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 </configuration>
                 <executions>
                 <executions>
                     <execution>
                     <execution>