X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-compatible-with-all%2Fpom.xml;h=6b6446b565780437ff0ce24c48cb5089d5c9610b;hb=7724350e652926b3afc43f3b07e9fe597b0ab73b;hp=23ddd8eb35a841787b5e08d2a2a5128d4052b8c7;hpb=3ac36c76f40e8d9eb431de939e0234362ed14679;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 23ddd8eb..6b6446b5 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>1.8.0-Carbon</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.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. -->
@@ -50,102 +48,224 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <dependencies>
-        <!-- External single feature 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 -->
+    <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 -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8362
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bgp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8363
-        <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>
-
-        <!-- Dlux -->
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>odl-dlux-core</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 -->
+        <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 -->
+        <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 -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
-        <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-restconf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- OpenFlow Plugin -->
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- SNMP -->
-        <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>odl-snmp-plugin</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- SXP -->
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>odl-sxp-controller</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
+        <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 -->
+        <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 -->
+        <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 -->
+        <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 -->
+        <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>