X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-all%2Fpom.xml;h=4da82eb47d495695e8bd0c8e3a0f3c1f8f47e348;hb=1f9e0751e22e3684211991d089bea8dda0c088a8;hp=b2fa631ccccd9c028c7fc6fcd4d48749a5d84272;hpb=8d41903e6fec15f727e9c5d4fe6b57031e106ebd;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index b2fa631c..4da82eb4 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>6.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-all</artifactId>
     <!-- TODO: Diferent name? -->
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.12.0-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. -->
@@ -58,24 +56,9 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
+
     <!-- External single feature dependencies in alphabetical order -->
     <profiles>
-        <!-- BIER -->
-        <profile>
-            <id>bier</id>
-            <activation>
-                <!-- Disabled due to failed merge job -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.bier</groupId>
-                    <artifactId>odl-bier-all</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- COE -->
         <profile>
             <id>coe</id>
@@ -91,22 +74,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- FaaS -->
-        <profile>
-            <id>faas</id>
-            <activation>
-                <!-- Commented out because of SFT memory problem -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.faas</groupId>
-                    <artifactId>odl-faas-all</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Genius -->
         <profile>
             <id>genius</id>
@@ -122,182 +89,11 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- GROUPBASEDPOLICY or GBP-->
-        <profile>
-            <id>groupbasedpolicy</id>
-            <activation>
-                <!-- Disabled because of SFT memory issues -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <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>
-            </dependencies>
-        </profile>
-        <!-- Honeycomb/VBD -->
-        <profile>
-            <id>honeycombvbd</id>
-            <activation>
-                <!-- netconf connector is broken after last bump migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <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>
-            </dependencies>
-        </profile>
-        <!-- L2switch -->
-        <profile>
-            <id>l2switch</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.l2switch</groupId>
-                    <artifactId>odl-l2switch-switch-rest</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- NEMO -->
-        <profile>
-            <id>nemo</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <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>
-            </dependencies>
-        </profile>
         <!-- Netconf -->
         <profile>
             <id>netconf</id>
             <activation>
-                <!-- netconf connector is broken after last bump migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -347,44 +143,11 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- OF-CONFIG -->
-        <profile>
-            <id>ofconfig</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.of-config</groupId>
-                    <artifactId>odl-of-config-all</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- P4 Plugin -->
-        <profile>
-            <id>p4plugin</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.p4plugin</groupId>
-                    <artifactId>odl-p4plugin-all</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- SFC -->
         <profile>
             <id>sfc</id>
             <activation>
-                <!-- netconf connector is broken after last bump migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -413,69 +176,22 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- TSDR -->
+        <!-- Serviceutils -->
         <profile>
-            <id>tsdr</id>
+            <id>serviceutils</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.tsdr</groupId>
-                    <artifactId>odl-tsdr-hsqldb-all</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- Unimgr -->
-        <profile>
-            <id>unimgr</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.unimgr</groupId>
-                    <artifactId>odl-unimgr</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- USC -->
-        <profile>
-            <id>usc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.usc</groupId>
-                    <artifactId>odl-usc-channel-ui</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.vtn</groupId>
-                    <artifactId>odl-vtn-manager-rest</artifactId>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-srm</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
                 <dependency>
-                    <groupId>org.opendaylight.vtn</groupId>
-                    <artifactId>odl-vtn-manager-neutron</artifactId>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-tools</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>