commit f87ccda4ee30bb4b02e0b6b75c865644854ae8a7
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Mon May 02 18:02:56 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue May 03 18:44:04 2016 +0000
tree 49d2d9a3bf8421b3c4a817bb6a59306761ba5c01
parent b3ef0db9203234ba9472aca1adfe71cd2e303331

Update gRPC to 0.14.0

Change-Id: Ida8d23183fc5af5a10bb4c5bbf7f718b7562bc62

incubator/rpc-grpc/features.xml

diff --git a/incubator/rpc-grpc/features.xml b/incubator/rpc-grpc/features.xml
index 5b7f618..72560ad 100644
--- a/incubator/rpc-grpc/features.xml
+++ b/incubator/rpc-grpc/features.xml
@@ -19,22 +19,23 @@
              description="${project.description}">
         <feature>onos-api</feature>
         <bundle>mvn:com.google.protobuf/protobuf-java/3.0.0-beta-2</bundle>
-        <bundle>mvn:io.netty/netty-common/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-buffer/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-codec-http2/4.1.0.CR3</bundle>
-        <bundle>mvn:io.netty/netty-resolver/4.1.0.CR3</bundle>
+        <bundle>mvn:io.netty/netty-common/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-buffer/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-transport/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-handler/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-codec/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-codec-http/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-codec-http2/4.1.0.CR7</bundle>
+        <bundle>mvn:io.netty/netty-resolver/4.1.0.CR7</bundle>
         <!-- TODO: Create shaded jar for these. -->
         <bundle>wrap:mvn:com.google.auth/google-auth-library-credentials/0.3.0$Bundle-SymbolicName=com.google.auth.google-auth-library-credentials&amp;Bundle-Version=0.3.0</bundle>
         <bundle>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/0.3.0$Bundle-SymbolicName=com.google.auth.google-auth-library-oauth2-http&amp;Bundle-Version=0.3.0</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-core/0.13.2$Bundle-SymbolicName=io.grpc.grpc-core&amp;Bundle-Version=0.13.2&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-protobuf/0.13.2$Bundle-SymbolicName=io.grpc.grpc-protobuf&amp;Bundle-Version=0.13.2&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-stub/0.13.2$Bundle-SymbolicName=io.grpc.grpc-stub&amp;Bundle-Version=0.13.2&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-netty/0.13.2$Bundle-SymbolicName=io.grpc.grpc-netty&amp;Bundle-Version=0.13.2&amp;Import-Package=io.netty.*;version=4.1.0.CR3,*</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-auth/0.13.2$Bundle-SymbolicName=io.grpc.grpc-auth&amp;Bundle-Version=0.13.2&amp;Import-Package=javax.net.ssl,*</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-core/0.14.0$Bundle-SymbolicName=io.grpc.grpc-core&amp;Bundle-Version=0.14.0&amp;</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-protobuf-lite/0.14.0$Bundle-SymbolicName=io.grpc.grpc-protobuf-lite&amp;Bundle-Version=0.14.0&amp;</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-protobuf/0.14.0$Bundle-SymbolicName=io.grpc.grpc-protobuf&amp;Bundle-Version=0.14.0&amp;</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-stub/0.14.0$Bundle-SymbolicName=io.grpc.grpc-stub&amp;Bundle-Version=0.14.0&amp;</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-netty/0.14.0$Bundle-SymbolicName=io.grpc.grpc-netty&amp;Bundle-Version=0.14.0&amp;Import-Package=io.netty.*;version=4.1.0.CR7,*</bundle>
+        <bundle>wrap:mvn:io.grpc/grpc-auth/0.14.0$Bundle-SymbolicName=io.grpc.grpc-auth&amp;Bundle-Version=0.14.0&amp;Import-Package=javax.net.ssl,*</bundle>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>

incubator/rpc-grpc/pom.xml

diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index c9191e0..4712473 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -32,8 +32,8 @@
         <onos.app.name>org.onosproject.incubator.rpc.grpc</onos.app.name>
         <onos.app.requires>org.onosproject.incubator.rpc</onos.app.requires>
         <!-- Note: update feature.xml when updating -->
-        <grpc.version>0.13.2</grpc.version>
-        <grpc.netty.version>4.1.0.CR3</grpc.netty.version>
+        <grpc.version>0.14.0</grpc.version>
+        <grpc.netty.version>4.1.0.CR7</grpc.netty.version>
     </properties>
 
     <dependencies>