Add Topoprocessing karaf4 features to distribution

Change-Id: Id9e8b559fadc65c53114f1d05fcef1432d1094e7
Signed-off-by: Andrej Záň <andrej.zan@pantheon.tech>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 8de8ae20f5785449e3d03892dca995087aa908ab..4c017d209b43acb82bfdbebea2904ced856863b0 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -55,13 +55,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.neutron</groupId>
-                <artifactId>neutron-artifacts</artifactId>
-                <version>${neutron.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.genius</groupId>
                 <artifactId>genius-artifacts</artifactId>
@@ -90,6 +83,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.neutron</groupId>
+                <artifactId>neutron-artifacts</artifactId>
+                <version>${neutron.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.openflowplugin</groupId>
                 <artifactId>openflowplugin-artifacts</artifactId>
@@ -118,6 +118,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.topoprocessing</groupId>
+                <artifactId>topoprocessing-artifacts</artifactId>
+                <version>${topoprocessing.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 96feb2ed1fd13b2dcaa5eff3ca4163d90a47b29a..a5bd778db19f81e919b5fd567d15b2f544453b3e 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -147,14 +147,6 @@
 
         <!-- FIXME: Add Mdsal -->
 
-        <!-- Neutron Northbound -->
-        <dependency>
-            <groupId>org.opendaylight.neutron</groupId>
-            <artifactId>features-neutron-service</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- Netconf -->
         <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
@@ -185,6 +177,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Neutron Northbound -->
+        <dependency>
+            <groupId>org.opendaylight.neutron</groupId>
+            <artifactId>features-neutron-service</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- ODL Parent -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
@@ -241,6 +241,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Topoprocessing -->
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>features-topoprocessing</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- TTP -->
         <dependency>
             <groupId>org.opendaylight.ttp</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 9221aec6876dc2320c9bb0488cab6697006e4c6d..2f52807c2a6f721c6312221aa308dc7e0b1c4e5d 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -57,18 +57,24 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
         <!-- External single feature dependencies in alphabetical order -->
+
+        <!-- Genius -->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>odl-genius-rest</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <!-- Netvirt -->
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>odl-netvirt-openstack</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 2b7bb96e083a2877067d29e6a50ca52433593444..2e6557b00d5459f76566eb991996c057cbc959a1 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -51,13 +51,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- Distribution -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-distribution-version</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
 
         <!-- User facing single features. Alphabetical order -->
 
@@ -69,10 +62,10 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- Neutron Northbound -->
+        <!-- Distribution -->
         <dependency>
-            <groupId>org.opendaylight.neutron</groupId>
-            <artifactId>odl-neutron-service</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-distribution-version</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -91,7 +84,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-pcep</artifactId>
@@ -121,6 +113,14 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Neutron Northbound -->
+        <dependency>
+            <groupId>org.opendaylight.neutron</groupId>
+            <artifactId>odl-neutron-service</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- OpenflowPlugin -->
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
@@ -170,5 +170,38 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- Topoprocessing -->
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>odl-topoprocessing-i2rs</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>odl-topoprocessing-inventory</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>odl-topoprocessing-inventory-rendering</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>odl-topoprocessing-network-topology</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.topoprocessing</groupId>
+            <artifactId>odl-topoprocessing-mlmt</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
     </dependencies>
 </project>