commit 165afdd61935cef95d299f05c3c96d596e671864
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Mar 06 20:18:13 2018 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Mar 06 20:28:45 2018 -0800
tree 6f0a59a5cb20cefc650a72f91b36655a6a252285
parent 8c0c8eff529deb0e3471dbf6d47c55b8260dc6c0

pom fix around gNMI

Change-Id: I6cd5190e7a9daa3d9050893d7b6195a01e549090

drivers/bmv2/pom.xml

diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index d9a9cf4..68391bf 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.11.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-grpc-protocol-api</artifactId>
+            <artifactId>onos-protocols-grpc-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -44,11 +44,27 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-incubator-bmv2-model</artifactId>
+            <artifactId>onos-protocols-p4runtime-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <!-- protocols/p4runtime/api missing -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-protocols-p4runtime-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-drivers-p4runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-pipelines-basic</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
 

drivers/gnmi/pom.xml

diff --git a/drivers/gnmi/pom.xml b/drivers/gnmi/pom.xml
index ae046d6..b7d169e 100644
--- a/drivers/gnmi/pom.xml
+++ b/drivers/gnmi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.11.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,9 +30,16 @@
 
     <description>gNMI device drivers</description>
     <dependencies>
+
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-grpc-protocol-api</artifactId>
+            <artifactId>onos-protocols-grpc-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-protocols-gnmi-stub</artifactId>
             <version>${project.version}</version>
         </dependency>
 

drivers/p4runtime/pom.xml

diff --git a/drivers/p4runtime/pom.xml b/drivers/p4runtime/pom.xml
index ff48f14..c1af001 100644
--- a/drivers/p4runtime/pom.xml
+++ b/drivers/p4runtime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.11.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,9 +30,10 @@
     
     <description>P4Runtime device drivers</description>
     <dependencies>
+
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-grpc-protocol-api</artifactId>
+            <artifactId>onos-protocols-grpc-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -42,6 +43,12 @@
             <version>1.3.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-protocols-p4runtime-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- protocols/p4runtime/api missing -->
 
     </dependencies>

drivers/pom.xml

diff --git a/drivers/pom.xml b/drivers/pom.xml
index cfc590d..4bc4cc7 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -49,9 +49,11 @@
         <module>lisp</module>
         <module>flowspec</module>
         <module>oplink</module>
-        <!-- <module>bmv2</module> -->
+        <module>p4runtime</module>
+        <module>bmv2</module>
         <module>hp</module>
         <module>microsemi/ea1000</module>
+        <module>gnmi</module>
     </modules>
 
     <!--<properties>