fix maven build
Change-Id: Ibc4d49eeac91275365fece235329e971b0f48e4b
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 713bed2..952b7b5 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -42,7 +42,6 @@
<module>rpc-nb</module>
<module>protobuf-nb</module>
<module>grpc</module>
- <module>bmv2</module>
</modules>
<dependencies>
diff --git a/pipelines/basic/pom.xml b/pipelines/basic/pom.xml
index ea234f5..f9c5e95 100644
--- a/pipelines/basic/pom.xml
+++ b/pipelines/basic/pom.xml
@@ -29,16 +29,19 @@
<packaging>bundle</packaging>
<dependencies>
+
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-incubator-bmv2-model</artifactId>
+ <artifactId>onos-protocols-p4runtime-model</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-protocols-p4runtime-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-drivers-default</artifactId>
diff --git a/protocols/p4runtime/model/pom.xml b/protocols/p4runtime/model/pom.xml
new file mode 100644
index 0000000..327dd72
--- /dev/null
+++ b/protocols/p4runtime/model/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017-present Open Networking Foundation
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>onos-protocols-p4runtime</artifactId>
+ <groupId>org.onosproject</groupId>
+ <version>1.12.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <description>ONOS P4 Runtime model</description>
+
+ <artifactId>onos-protocols-p4runtime-model</artifactId>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-protocols-p4runtime-proto</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/protocols/p4runtime/pom.xml b/protocols/p4runtime/pom.xml
index 6dfdde6..31af40d 100644
--- a/protocols/p4runtime/pom.xml
+++ b/protocols/p4runtime/pom.xml
@@ -32,14 +32,11 @@
<modules>
<module>api</module>
- <module>proto</module>
- <module>ctl</module>
+ <module>proto</module>
+ <module>ctl</module>
+ <module>model</module>
</modules>
- <!--<properties>
- <onos.app.name>org.onosproject.drivers</onos.app.name>
- </properties>-->
-
<dependencies>
<dependency>
diff --git a/protocols/p4runtime/proto/pom.xml b/protocols/p4runtime/proto/pom.xml
index 7e16bad..3ab9a23 100644
--- a/protocols/p4runtime/proto/pom.xml
+++ b/protocols/p4runtime/proto/pom.xml
@@ -29,7 +29,6 @@
<description>ONOS P4Runtime Proto</description>
<properties>
- <os.detected.classifier>linux-x86_64</os.detected.classifier>
<protobuf.version>3.0.2</protobuf.version>
<piCommit>a8814a8ac40838a9df83fe47a17a025b69026fcf</piCommit>
<piBaseUrl>https://github.com/p4lang/PI.git</piBaseUrl>
@@ -60,6 +59,15 @@
</dependencies>
<build>
+
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>1.5.0.Final</version>
+ </extension>
+ </extensions>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>