Fix odl-genius

Multiple things done to clean up packaging:
- use properly-imported artifacts poms from upstream to eliminate
  properties
- add proper dependency on odl-serviceutils-listener to eliminate
  duplicate packaging
- eliminate unneeded explicit dependencies, they are pulled in as
  needed
- cloudscaler dependency on javax.annotation is optional, as it is
  not used in Karaf and should not be pulled into the feature

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

diff --git a/cloudscaler/impl/pom.xml b/cloudscaler/impl/pom.xml
index ac95774c2538e06cbd24da3d3370c3b00c110ef6..0156a63a9081cb835b1dc5be219498bf7e585894 100644 (file)
--- a/cloudscaler/impl/pom.xml
+++ b/cloudscaler/impl/pom.xml
@@ -93,6 +93,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index ba88d2b18305a39568bf8b6ff049356c0aa7258e..2ab094842bcb31c1d3cf7007cf424f9ca25d3dd5 100644 (file)
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -22,16 +22,50 @@
   <packaging>feature</packaging>
   <name>OpenDaylight :: genius :: Impls</name>
 
-  <!-- TODO Replace all <properties> by dependencyManagement <scope>import of respective upstream project -->
-  <properties>
-    <openflowplugin.version>0.10.0-SNAPSHOT</openflowplugin.version>
-    <ovsdb.version>1.10.0-SNAPSHOT</ovsdb.version>
-    <infrautils.version>1.7.0-SNAPSHOT</infrautils.version>
-    <daexim.version>1.7.0-SNAPSHOT</daexim.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.infrautils</groupId>
+        <artifactId>infrautils-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.serviceutils</groupId>
+        <artifactId>serviceutils-artifacts</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.daexim</groupId>
+        <artifactId>daexim-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>southbound-artifacts</artifactId>
+        <version>1.10.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>hwvtepsouthbound-artifacts</artifactId>
+        <version>1.10.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-artifacts</artifactId>
+        <version>0.10.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.genius</groupId>
         <artifactId>genius-artifacts</artifactId>
@@ -50,101 +84,79 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.serviceutils</groupId>
+      <artifactId>odl-serviceutils-listener</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>odl-serviceutils-srm</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-diagstatus</artifactId>
-      <version>${infrautils.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>odl-ovsdb-southbound-impl</artifactId>
-      <version>${ovsdb.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
-      <version>${ovsdb.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>odl-ovsdb-utils</artifactId>
-      <version>${ovsdb.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-southbound</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-app-reconciliation-framework</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-metrics</artifactId>
-      <version>${infrautils.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-inject</artifactId>
-      <version>${infrautils.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-jobcoordinator</artifactId>
-      <version>${infrautils.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.daexim</groupId>
       <artifactId>odl-daexim</artifactId>
-      <version>${daexim.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
 
-    <!-- External libraries to wrap -->
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-
     <!-- Bundles from this project -->
     <dependency>
       <groupId>org.opendaylight.genius</groupId>