From dc13d39f47f5237d64ce79f2bf10d7666475efd3 Mon Sep 17 00:00:00 2001
From: Yuta HIGUCHI <y-higuchi@ak.jp.nec.com>
Date: Wed, 21 Jun 2017 17:42:13 -0700
Subject: [PATCH] Fixing pom.xml

- onos-core-net was failing due to dependency to incubator-bmv2-model

Change-Id: I3ae0989b1f601c754af495a59e6be88bc474e78d
---
 core/net/pom.xml             |  7 +++++++
 incubator/bmv2/model/pom.xml |  6 +++---
 incubator/bmv2/pom.xml       | 36 ++++++++++++++++++++++++++++++++++++
 incubator/pom.xml            |  1 +
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 incubator/bmv2/pom.xml

diff --git a/core/net/pom.xml b/core/net/pom.xml
index 9487190f09..eaad6e877d 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -78,6 +78,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-incubator-bmv2-model</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
diff --git a/incubator/bmv2/model/pom.xml b/incubator/bmv2/model/pom.xml
index 0186416445..479f5311d2 100644
--- a/incubator/bmv2/model/pom.xml
+++ b/incubator/bmv2/model/pom.xml
@@ -19,11 +19,11 @@
          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-bmv2-model</artifactId>
+        <artifactId>onos-incubator-bmv2</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.11.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
-    <artifactId>onos-bmv2-model</artifactId>
-</project>
\ No newline at end of file
+    <artifactId>onos-incubator-bmv2-model</artifactId>
+</project>
diff --git a/incubator/bmv2/pom.xml b/incubator/bmv2/pom.xml
new file mode 100644
index 0000000000..3c3bc38b8e
--- /dev/null
+++ b/incubator/bmv2/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017-present Open Networking Laboratory
+  ~
+  ~ 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onosproject</groupId>
+        <artifactId>onos-incubator</artifactId>
+        <version>1.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>onos-incubator-bmv2</artifactId>
+    <packaging>pom</packaging>
+
+
+    <modules>
+        <module>model</module>
+    </modules>
+
+</project>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 9148a6e122..310dc18c20 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -43,6 +43,7 @@
         <module>rpc-nb</module>
         <module>protobuf-nb</module>
         <module>grpc</module>
+        <module>bmv2</module>
     </modules>
 
     <dependencies>