commit 88353862f726d1cb0942526f8d5b026072ea5fe8
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Aug 09 17:57:04 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Aug 10 23:52:18 2016 +0000
tree 793c2eefe167f2ecf67fc525313a4cb6f1241672
parent f4fd2a2e47de48c272b26e54281a401d5be44b17

Consolidate gRPC OSGi bundle handling

Change-Id: I01e5058e08372b142058769db081b8de154e1c9b

incubator/rpc-grpc/features.xml

diff --git a/incubator/rpc-grpc/features.xml b/incubator/rpc-grpc/features.xml
index 4061b6e..e643647 100644
--- a/incubator/rpc-grpc/features.xml
+++ b/incubator/rpc-grpc/features.xml
@@ -17,26 +17,8 @@
 <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</bundle>
-        <bundle>mvn:io.netty/netty-common/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-buffer/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http2/4.1.3.Final</bundle>
-        <bundle>mvn:io.netty/netty-resolver/4.1.3.Final</bundle>
-        <!-- TODO: Create shaded jar for these. -->
-        <bundle>wrap:mvn:com.google.auth/google-auth-library-credentials/0.4.0$Bundle-SymbolicName=com.google.auth.google-auth-library-credentials&amp;Bundle-Version=0.4.0</bundle>
-        <bundle>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/0.4.0$Bundle-SymbolicName=com.google.auth.google-auth-library-oauth2-http&amp;Bundle-Version=0.4.0</bundle>
-        <!-- io.grpc.internal required for DnsNameResolverProvider -->
-        <bundle>wrap:mvn:io.grpc/grpc-core/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-core&amp;Bundle-Version=1.0.0&amp;Export-Package=*;version=1.0.0,io.grpc.internal;version=1.0.0&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-protobuf-lite/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-protobuf-lite&amp;Bundle-Version=1.0.0&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-protobuf/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-protobuf&amp;Bundle-Version=1.0.0&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-stub/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-stub&amp;Bundle-Version=1.0.0&amp;</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-netty/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-netty&amp;Bundle-Version=1.0.0&amp;Import-Package=io.netty.*;version=4.1.3,*</bundle>
-        <bundle>wrap:mvn:io.grpc/grpc-auth/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-auth&amp;Bundle-Version=1.0.0&amp;Import-Package=javax.net.ssl,*</bundle>
+        <feature version="${project.version}">onos-api</feature>
+
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>