Fix odl-genius-api

Multiple things done here:
- use artifacts to import proper upstream versions
- add dependency on odl-openflowplugin-eric-extensions
  to prevent duplicate packaging of Ericsson extensions

Change-Id: I79f51be20559798a0539a65e1cf924bbc32f2278
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index 000c22a9bdd2201ca5c2bebe8b97c9d3731ab497..b8993914d1d5b491d551b00769e1bfb1edcb89c1 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -31,6 +31,41 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.infrautils</groupId>
+        <artifactId>infrautils-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.serviceutils</groupId>
+        <artifactId>serviceutils-artifacts</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-artifacts</artifactId>
+        <version>0.10.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>hwvtepsouthbound-artifacts</artifactId>
+        <version>1.10.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>southbound-artifacts</artifactId>
+        <version>1.10.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.genius</groupId>
         <artifactId>genius-artifacts</artifactId>
@@ -58,69 +93,68 @@
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>odl-ovsdb-southbound-api</artifactId>
-      <version>1.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>odl-ovsdb-hwvtepsouthbound-api</artifactId>
-      <version>1.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-nsf-model</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-eric-extensions</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-libraries</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-inject</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-jobcoordinator</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-caches</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>odl-serviceutils-tools</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>odl-ovsdb-utils</artifactId>
+      <!-- FIXME: remove this version declaration once ovsdb
+                  provides proper ovsdb-artifacts -->
       <version>1.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>