[ONOS-4520] Separate ProtoBuf model from gRPC services
Change-Id: Ib1e1358b1fd49206cfd15ffbba3b1448376d1702
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index 4712473..20ccf20 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -30,7 +30,8 @@
<properties>
<onos.app.name>org.onosproject.incubator.rpc.grpc</onos.app.name>
- <onos.app.requires>org.onosproject.incubator.rpc</onos.app.requires>
+ <onos.app.requires>org.onosproject.incubator.rpc,org.onosproject.incubator.protobuf</onos.app.requires>
+ <protobuf.version>3.0.0-beta-2</protobuf.version>
<!-- Note: update feature.xml when updating -->
<grpc.version>0.14.0</grpc.version>
<grpc.netty.version>4.1.0.CR7</grpc.netty.version>
@@ -51,13 +52,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- <version>${grpc.version}</version>
- </dependency>
--->
+
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
@@ -98,10 +93,17 @@
</dependency>
<dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-protobuf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<scope>provided</scope>
</dependency>
+
</dependencies>
<build>
@@ -206,7 +208,7 @@
<!-- 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:3.0.0-beta-2:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<checkStaleness>true</checkStaleness>