RELENG-63: Move COE bundle to odl-netvirt-coe

odl-netvirt-impl currently includes the coe-impl bundle, which causes
issues for two reasons:

* coe-impl depends on coe-northbound-api (from the coe project), but
  odl-netvirt-impl doesn't depend on that (directly or indirectly); this
  results in the odl-netvirt-impl including a coe bundle which is
  incorrect;
* the coe-northbound-api is included in coe’s odl-coe-api feature, so
  the above results in two features containing the coe-northbound-api,
  which is also incorrect.

Moving coe-impl to odl-netvirt-coe ensures that odl-netvirt-impl itself
stays independent of COE, and ensures that no NetVirt feature directly
includes a COE bundle.

Change-Id: Ibe12e48eda592ff58af97f0b1df3da295b8f3f0c
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/features/odl-netvirt-coe/pom.xml b/features/odl-netvirt-coe/pom.xml
index fda41be46ddf32d49bbbb37191a14a43c9a6a009..c2c4cdcbb63d8464141917591fbb1cbe6a7096a0 100644 (file)
--- a/features/odl-netvirt-coe/pom.xml
+++ b/features/odl-netvirt-coe/pom.xml
@@ -45,5 +45,10 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>coe-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-netvirt-impl/pom.xml b/features/odl-netvirt-impl/pom.xml
index ac89ec74d013eba40cb0910b6462a68520f0d712..b539341d18d26510b941c6447aab9beb5b6d0e08 100644 (file)
--- a/features/odl-netvirt-impl/pom.xml
+++ b/features/odl-netvirt-impl/pom.xml
@@ -133,11 +133,6 @@
             <artifactId>cloud-servicechain-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>coe-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>dhcpservice-impl</artifactId>