X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-compatible-with-all%2Fpom.xml;h=f1252d021426f23fe1d117af9279dd8ecbb65538;hp=6804ef63132fe724e9693e3060bc97df0da809f1;hb=refs%2Fheads%2Fstable%2Ffluorine;hpb=93deb3ab41c417e2389e1a1fbbd3079db99a42fb

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 6804ef63..f1252d02 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-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>2.0.2</version>
+        <version>3.1.7</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.9.4-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. -->
@@ -50,341 +48,224 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <dependencies>
-
-        <!-- User facing single features. Alphabetical order -->
 
+    <!-- User facing single features. Alphabetical order -->
+    <profiles>
         <!-- AAA -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>odl-aaa-shiro</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
+        <profile>
+            <id>aaa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.aaa</groupId>
+                    <artifactId>odl-aaa-shiro</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- BGPCEP -->
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bgp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bmp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-pcep</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-rsvp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
+        <profile>
+            <id>bgpcep</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.bgpcep</groupId>
+                    <artifactId>odl-bgpcep-bgp</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.bgpcep</groupId>
+                    <artifactId>odl-bgpcep-bmp</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.bgpcep</groupId>
+                    <artifactId>odl-bgpcep-pcep</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.bgpcep</groupId>
+                    <artifactId>odl-bgpcep-rsvp</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Daexim -->
-        <dependency>
-	    <groupId>org.opendaylight.daexim</groupId>
-            <artifactId>odl-daexim-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Distribution -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-distribution-version</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- DluxApps -->
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>odl-dluxapps-nodes</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>odl-dluxapps-topology</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>odl-dluxapps-yangman</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>odl-dluxapps-yangvisualizer</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Honeycomb/VBD -->
-        <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>
-
+        <profile>
+            <id>daexim</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.daexim</groupId>
+                    <artifactId>odl-daexim-all</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- InfraUtils -->
+        <profile>
+            <id>infrautils</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.infrautils</groupId>
+                    <artifactId>odl-infrautils-ready</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- LISP Flow Mapping -->
-        <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>odl-lispflowmapping-msmr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
+        <profile>
+            <id>lispflowmapping</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.lispflowmapping</groupId>
+                    <artifactId>odl-lispflowmapping-msmr</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Netconf -->
-        <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-mdsal-apidocs</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <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-restconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-yanglib</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
+        <profile>
+            <id>netconf</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-mdsal-apidocs</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-restconf</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.netconf</groupId>
+                    <artifactId>odl-yanglib</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Neutron Northbound -->
-        <dependency>
-            <groupId>org.opendaylight.neutron</groupId>
-            <artifactId>odl-neutron-service</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- OCPplugin -->
-        <dependency>
-            <groupId>org.opendaylight.ocpplugin</groupId>
-            <artifactId>odl-ocpplugin-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
+        <profile>
+            <id>neutron</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.neutron</groupId>
+                    <artifactId>odl-neutron-service</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- 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>
-
+        <profile>
+            <id>openflowplugin</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <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>
+            </dependencies>
+        </profile>
         <!-- OVSDB -->
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>odl-ovsdb-library</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>odl-ovsdb-southbound-impl</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Packetcable -->
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>odl-packetcable-policy-model</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <!-- Commenting because SFT memory issue
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>odl-packetcable-policy-server</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>odl-packetcable-policy-server-all</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
+        <profile>
+            <id>ovsdb</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.ovsdb</groupId>
+                    <artifactId>odl-ovsdb-library</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.ovsdb</groupId>
+                    <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.ovsdb</groupId>
+                    <artifactId>odl-ovsdb-southbound-impl</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- SFC -->
-        <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-ovs</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-sb-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-test-consumer</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfc-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>odl-sfclisp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- SNMP4SDN -->
-        <dependency>
-            <groupId>org.opendaylight.snmp4sdn</groupId>
-            <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- SXP -->
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>odl-sxp-controller</artifactId>
-            <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>
-
-        <!-- TTP -->
-        <dependency>
-            <groupId>org.opendaylight.ttp</groupId>
-            <artifactId>odl-ttp-model-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Unimgr -->
-        <!-- This project is still using odlparent 1.9.0
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>odl-unimgr</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-ovs</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-sb-rest</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfclisp</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.sfc</groupId>
+                    <artifactId>odl-sfc-shell</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>