Consolidate gRPC OSGi bundle handling
Change-Id: I01e5058e08372b142058769db081b8de154e1c9b
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index d8e75b7..832ac73 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -33,10 +33,10 @@
<onos.app.title>ONOS gRPC API</onos.app.title>
<onos.app.requires>
org.onosproject.incubator.rpc,
- org.onosproject.incubator.protobuf
+ org.onosproject.incubator.protobuf,
+ org.onosproject.incubator.grpc
</onos.app.requires>
<protobuf.version>3.0.0</protobuf.version>
- <!-- Note: update feature.xml when updating -->
<grpc.version>1.0.0-pre2</grpc.version>
<grpc.netty.version>4.1.3.Final</grpc.netty.version>
</properties>
@@ -72,16 +72,6 @@
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-auth</artifactId>
- <version>${grpc.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -103,6 +93,12 @@
</dependency>
<dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-grpc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<scope>provided</scope>
@@ -151,10 +147,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>