X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-all%2Fpom.xml;h=7b1b2dec8d94c703b41c2fa3c66ae2a6a6bafef5;hb=fbac18ce8adb62935d741d5793049aaaf15d8860;hp=cf93b0aaf7db72c47d55526870a4f15655c05ac7;hpb=a47f52562ee6590d5890b988fb5bc8bf3706e6dd;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index cf93b0aa..7b1b2dec 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -6,20 +6,18 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-all</artifactId>
     <!-- TODO: Diferent name? -->
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.3-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -57,326 +55,147 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+    </dependencies>
 
-        <!-- External single feature dependencies in alphabetical order -->
-
-        <!-- BIER -->
-        <!-- Comment due to fail merge job
-        <dependency>
-            <groupId>org.opendaylight.bier</groupId>
-            <artifactId>odl-bier-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
+    <!-- External single feature dependencies in alphabetical order -->
+    <profiles>
         <!-- COE -->
-        <dependency>
-            <groupId>org.opendaylight.coe</groupId>
-            <artifactId>odl-coe</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- FaaS -->
-        <!-- Comment out because of SFT memory problem
-        <dependency>
-            <groupId>org.opendaylight.faas</groupId>
-            <artifactId>odl-faas-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
+        <profile>
+            <id>coe</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.coe</groupId>
+                    <artifactId>odl-coe</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Genius -->
-        <dependency>
-            <groupId>org.opendaylight.genius</groupId>
-            <artifactId>odl-genius-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- GROUPBASEDPOLICY or GBP-->
-        <!-- Commenting this feature because SFT memory issues
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-iovisor</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-neutronmapper</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-neutron-and-ofoverlay</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ofoverlay</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-vpp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-neutron-vpp-mapper</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ip-sgt-distribution-service</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ne-location-provider</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ios-xe</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-sxp-ep-provider</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-sxp-ise-adapter</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- Honeycomb/VBD -->
-        <!-- netconf connector is broken after last bump migration
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd-rest</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd-ui</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- L2switch -->
-        <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch-rest</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- NEMO -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>odl-nemo-engine</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>odl-nemo-engine-rest</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>odl-nemo-engine-ui</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>odl-nemo-openflow-renderer</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>odl-nemo-cli-renderer</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
+        <profile>
+            <id>genius</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.genius</groupId>
+                    <artifactId>odl-genius-rest</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Netconf -->
-        <!-- netconf connector is broken after last bump migration
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-callhome-ssh</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-console</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-       <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-mdsal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-topology</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-clustered-topology</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
+        <profile>
+            <id>netconf</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-netconf-callhome-ssh</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-netconf-console</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-netconf-mdsal</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-netconf-topology</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-netconf-clustered-topology</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Netvirt -->
-        <dependency>
-            <groupId>org.opendaylight.netvirt</groupId>
-            <artifactId>odl-netvirt-openstack</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- OF-CONFIG -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.of-config</groupId>
-            <artifactId>odl-of-config-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- P4 Plugin -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.p4plugin</groupId>
-            <artifactId>odl-p4plugin-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
+        <profile>
+            <id>netvirt</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.netvirt</groupId>
+                    <artifactId>odl-netvirt-openstack</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- SFC -->
-        <!-- netconf connector is broken after last bump migration
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-ios-xe-renderer</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-netconf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-openflow-renderer</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-vpp-renderer</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- TSDR -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.tsdr</groupId>
-            <artifactId>odl-tsdr-hsqldb-all</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- Unimgr -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>odl-unimgr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- USC -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.usc</groupId>
-            <artifactId>odl-usc-channel-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- VTN -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>odl-vtn-manager-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>odl-vtn-manager-neutron</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-    </dependencies>
+        <profile>
+            <id>sfc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-ios-xe-renderer</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-netconf</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-openflow-renderer</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-vpp-renderer</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- Serviceutils -->
+        <profile>
+            <id>serviceutils</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-srm</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-tools</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>