Add genius and dependencies

This adds Genius, Openflowplugin and Infrautils.

Change-Id: Id1fb27330ad75619485d0d01b0a3c50e341d9acf
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index d6734d3aab05d00d59caad6383563d50dceeb05e..00c433964c6888d083c7860e4b85648fb88767e1 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -39,7 +39,7 @@
     </scm>
     <dependencyManagement>
         <dependencies>
-            <!-- Project artifact poms. -->
+            <!-- Project artifact poms. Alphabetical order -->
             <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -55,6 +55,20 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.genius</groupId>
+                <artifactId>genius-artifacts</artifactId>
+                <version>${genius.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.infrautils</groupId>
+                <artifactId>infrautils-artifacts</artifactId>
+                <version>${infrautils.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>restconf-artifacts</artifactId>
@@ -62,23 +76,30 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>${openflowplugin.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>library-artifacts</artifactId>
+                <artifactId>hwvtepsouthbound-artifacts</artifactId>
                 <version>${ovsdb.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>southbound-artifacts</artifactId>
+                <artifactId>library-artifacts</artifactId>
                 <version>${ovsdb.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>hwvtepsouthbound-artifacts</artifactId>
+                <artifactId>southbound-artifacts</artifactId>
                 <version>${ovsdb.version}</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index c75c18f13d66cfd987eeb92d990402a2045189d6..fda7bfeb422aedd8563628f27683304c25cba0e1 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -52,7 +52,7 @@
     </dependencyManagement>
     <dependencies>
 
-        <!-- User facing single features. -->
+        <!-- User facing single features. Alphabetical order -->
         <!-- FIXME: How to explain to feature-repo-parent it shall not list single features from repo dependencies? -->
 
         <!-- AAA -->
@@ -97,6 +97,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Genius -->
+        <dependency>
+            <groupId>org.opendaylight.genius</groupId>
+            <artifactId>genius-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- InfraUtils -->
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
@@ -151,8 +159,19 @@
             <type>xml</type>
         </dependency>
 
-        <!-- FIXME: Add Yangtools -->
-
+        <!-- OpenflowPlugin -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>features-openflowplugin</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>features-openflowplugin-extension</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <!-- OVSDB -->
         <dependency>
@@ -163,15 +182,18 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>southbound-features</artifactId>
+            <artifactId>hwvtepsouthbound-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>hwvtepsouthbound-features</artifactId>
+            <artifactId>southbound-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- FIXME: Add Yangtools -->
+
     </dependencies>
 </project>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 386012659e277ef890b86524cdadd98eb6ae9567..bff123d5f3d63b9e638598adcff2298989e7aeae 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -57,6 +57,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!-- External single feature dependencies. -->
+        <!-- External single feature dependencies in alphabetical order -->
+        <dependency>
+            <groupId>org.opendaylight.genius</groupId>
+            <artifactId>odl-genius-rest</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 22c27c0b07a9f9345465af89216ea67290488029..a062d3d1eab0f0b3d620f8a6a6ac3ecb66749ea3 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -59,7 +59,7 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- User facing single features. -->
+        <!-- User facing single features. Alphabetical order -->
 
         <!-- AAA -->
         <dependency>
@@ -93,6 +93,20 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- OpenflowPlugin -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- OVSDB -->
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
@@ -102,13 +116,13 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>odl-ovsdb-southbound-impl</artifactId>
+            <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
+            <artifactId>odl-ovsdb-southbound-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>