X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-compatible-with-all%2Fpom.xml;h=96128255b11017aec875d683e81f3202eaca5c07;hb=0bd557e3ae3b2fca9bdfa8d115e1b2698d14feb4;hp=19f69a78b3ec47dfa21343c9b877e662b24edbbc;hpb=b8949af4f2de393f811b61e68b9e4853552d56ec;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 19f69a78..96128255 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>3.0.2</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.9.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. -->
@@ -51,18 +49,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <!-- Override odlparent default to get the speed improvements in feature generation
-         FIXME: remove this once odlparent ships 4.1.5+ -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <version>4.1.5</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <!-- User facing single features. Alphabetical order -->
     <profiles>
         <!-- AAA -->
@@ -80,46 +66,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- ALTO -->
-        <profile>
-            <id>alto</id>
-            <activation>
-                <!-- Commented because of SFT memory issues -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.alto</groupId>
-                    <artifactId>odl-alto-simpleird</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.alto</groupId>
-                    <artifactId>odl-alto-manual-maps</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.alto</groupId>
-                    <artifactId>odl-alto-simpleecs</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.alto</groupId>
-                    <artifactId>odl-alto-auto-maps</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.alto</groupId>
-                    <artifactId>odl-alto-spce</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- BGPCEP -->
         <profile>
             <id>bgpcep</id>
@@ -168,49 +114,31 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- DluxApps -->
+        <!-- InfraUtils -->
         <profile>
-            <id>dluxapps</id>
+            <id>infrautils</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <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>
+                    <groupId>org.opendaylight.infrautils</groupId>
+                    <artifactId>odl-infrautils-ready</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
             </dependencies>
         </profile>
-        <!-- InfraUtils -->
+        <!-- jsonrpc -->
         <profile>
-            <id>infrautils</id>
+            <id>jsonrpc</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.infrautils</groupId>
-                    <artifactId>odl-infrautils-ready</artifactId>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>odl-jsonrpc-all</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
@@ -273,38 +201,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- NIC -->
-        <profile>
-            <id>nic</id>
-            <activation>
-                <!-- Disabled because of SFT memory issues -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.nic</groupId>
-                    <artifactId>odl-nic-intent-common</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- OCPplugin -->
-        <profile>
-            <id>ocpplugin</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.ocpplugin</groupId>
-                    <artifactId>odl-ocpplugin-all</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- OpenflowPlugin -->
         <profile>
             <id>openflowplugin</id>
@@ -353,95 +249,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Packetcable -->
-        <profile>
-            <id>packetcable</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.packetcable</groupId>
-                    <artifactId>odl-packetcable-policy-model</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <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>
-            </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>
-        <!-- SNMP4SDN -->
-        <profile>
-            <id>snmp4sdn</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.snmp4sdn</groupId>
-                    <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- SXP -->
-        <profile>
-            <id>sxp</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.sxp</groupId>
-                    <artifactId>odl-sxp-controller</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>