Update gRPC
- Update gRPC and it's dependencies to 0.13.2
- Use pre-defined default port if not specified by URI
- Cosmetic fixes
Change-Id: Iac8c3ba4c6fe1b5925ea8832e61d313adfad6f71
diff --git a/incubator/rpc-grpc/features.xml b/incubator/rpc-grpc/features.xml
index 20bda8f..5b7f618 100644
--- a/incubator/rpc-grpc/features.xml
+++ b/incubator/rpc-grpc/features.xml
@@ -14,24 +14,27 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="${project.artifactId}-${project.version}">
<feature name="${project.artifactId}" version="${project.version}"
description="${project.description}">
<feature>onos-api</feature>
- <bundle>mvn:com.google.protobuf/protobuf-java/3.0.0-beta-1</bundle>
- <bundle>mvn:io.netty/netty-common/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-buffer/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-transport/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-handler/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-codec/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-codec-http/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-codec-http2/4.1.0.Beta6</bundle>
- <bundle>mvn:io.netty/netty-resolver/4.1.0.Beta6</bundle>
- <bundle>mvn:com.twitter/hpack/0.11.0</bundle>
+ <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>
<!-- 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&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&Bundle-Version=0.3.0</bundle>
- <bundle>wrap:mvn:io.grpc/grpc-all/0.9.0$Bundle-SymbolicName=io.grpc.grpc-all&Bundle-Version=0.9.0&Import-Package=io.netty.*;version=4.1.0.Beta6,javax.net.ssl,com.google.protobuf.nano;resolution:=optional,okio;resolution:=optional,*</bundle>
+ <bundle>wrap:mvn:io.grpc/grpc-core/0.13.2$Bundle-SymbolicName=io.grpc.grpc-core&Bundle-Version=0.13.2&</bundle>
+ <bundle>wrap:mvn:io.grpc/grpc-protobuf/0.13.2$Bundle-SymbolicName=io.grpc.grpc-protobuf&Bundle-Version=0.13.2&</bundle>
+ <bundle>wrap:mvn:io.grpc/grpc-stub/0.13.2$Bundle-SymbolicName=io.grpc.grpc-stub&Bundle-Version=0.13.2&</bundle>
+ <bundle>wrap:mvn:io.grpc/grpc-netty/0.13.2$Bundle-SymbolicName=io.grpc.grpc-netty&Bundle-Version=0.13.2&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&Bundle-Version=0.13.2&Import-Package=javax.net.ssl,*</bundle>
<bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
</feature>
</features>