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/protobuf/features.xml

diff --git a/incubator/protobuf/features.xml b/incubator/protobuf/features.xml
index c19a13b..e8fbc06 100644
--- a/incubator/protobuf/features.xml
+++ b/incubator/protobuf/features.xml
@@ -18,7 +18,7 @@
     <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:com.google.protobuf/protobuf-java/${protobuf.version}</bundle>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>

incubator/protobuf/pom.xml

diff --git a/incubator/protobuf/pom.xml b/incubator/protobuf/pom.xml
index 10246c4..c5969fc 100644
--- a/incubator/protobuf/pom.xml
+++ b/incubator/protobuf/pom.xml
@@ -125,9 +125,6 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <!-- The version of protoc must match protobuf-java. If you don't 
-                        depend on protobuf-java directly, you will be transitively depending on the 
-                        protobuf-java version that grpc depends on. -->
                     <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                 </configuration>
                 <executions>