From 5073dd509700587e2067ad674e5250f0e112f709 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 27 Oct 2017 04:29:29 +0000
Subject: [PATCH] Revert "Bug 9307: Split features to avoid incompatiblities"

This reverts commit a89958c401cd01a4c26bd3833c42750e7582cf60.

Change-Id: Ib199b622ad43060b973daa2f43b72876bf6f915b
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/distribution/pom.xml                |  14 ---
 features/repos/test/pom.xml                   |  12 --
 features/singles/odl-integration-all/pom.xml  |   5 +-
 .../pom.xml                                   |  91 --------------
 .../pom.xml                                   | 119 ------------------
 .../pom.xml                                   |  69 ++++++++--
 features/singles/pom.xml                      |   2 -
 7 files changed, 61 insertions(+), 251 deletions(-)
 delete mode 100644 features/singles/odl-integration-compatible-with-1node/pom.xml
 delete mode 100644 features/singles/odl-integration-compatible-with-3node/pom.xml

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 2518793b..a9bfe1b6 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -70,20 +70,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-integration-compatible-with-1node</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-integration-compatible-with-3node</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-integration-all</artifactId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 46f1665a..27286f0c 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -57,18 +57,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-integration-compatible-with-1node</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-integration-compatible-with-3node</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-integration-all</artifactId>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 6380e200..a907c1eb 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -24,10 +24,7 @@
     <!-- <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. -->
     <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>
-        Single feature containing all features separately compatible with odl-integration-compatible-with-all.
-        TODO: Split out 1node and 3node compatibility classes.
-    </description>
+    <description>Single feature containing all features separately compatible with odl-integration-compatible-with-all.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
         <license>
diff --git a/features/singles/odl-integration-compatible-with-1node/pom.xml b/features/singles/odl-integration-compatible-with-1node/pom.xml
deleted file mode 100644
index a9301e2a..00000000
--- a/features/singles/odl-integration-compatible-with-1node/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>odl-integration-compatible-with-1node</artifactId>
-    <!-- TODO: Shorter name? -->
-    <version>0.8.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. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>
-        Single feature containing all features compatible with most and with 1node legacy deployments.
-        This should consist of odl-integration-compatible-with-all
-        and additional features which are not compatible with 3node deployments.
-        Typical bundle which should not be installed: org.opendaylight.netconf:netconf-topology-singleton.
-    </description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-compatible-with-all;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-integration-compatible-with-all</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- User facing single features. Alphabetical order -->
-
-        <!-- Netconf -->
-        <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>
-
-        <!-- Unimgr -->
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>odl-unimgr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/features/singles/odl-integration-compatible-with-3node/pom.xml b/features/singles/odl-integration-compatible-with-3node/pom.xml
deleted file mode 100644
index 10182994..00000000
--- a/features/singles/odl-integration-compatible-with-3node/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>odl-integration-compatible-with-3node</artifactId>
-    <!-- TODO: Shorter name? -->
-    <version>0.8.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. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>
-        Single feature containing all features compatible with most and with 3node deployments.
-        This should consist of odl-integration-compatible-with-all
-        and additional features which are not compatible with 1node legacy deployments.
-        Typical bundle which should not be installed: org.opendaylight.netconf:netconf-topology-config.
-    </description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-compatible-with-all;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-integration-compatible-with-all</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- User facing single features. Alphabetical order -->
-
-        <!-- GROUPBASEDPOLICY or GBP-->
-        <!-- Commenting this feature because SFT memory issues
-        <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-neutron-vpp-mapper</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>
-        -->
-
-        <!-- 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>
-
-        <!-- Netconf -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-clustered-topology</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 8862f28d..f7f9d61d 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -24,13 +24,7 @@
     <!-- <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. -->
     <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>
-        Single feature containing all features compatible with most.
-        If a feature is known to be incompatible with any typical use case,
-        for 1node or 3node deployment, it should not be listed here.
-        See other feature definitions for compatibility details.
-        Note: Even commented-out features should be moved to their appropriate compatibility class.
-    </description>
+    <description>Single feature containing all features compatible together.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
         <license>
@@ -130,7 +124,7 @@
 
         <!-- Daexim -->
         <dependency>
-        <groupId>org.opendaylight.daexim</groupId>
+	    <groupId>org.opendaylight.daexim</groupId>
             <artifactId>odl-daexim-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
@@ -202,6 +196,18 @@
             <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>
@@ -220,6 +226,12 @@
             <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>
@@ -234,6 +246,26 @@
         </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>
+
         <!-- InfraUtils -->
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
@@ -251,7 +283,6 @@
         </dependency>
 
         <!-- Netconf -->
-        <!-- odl-netconf-callhome-ssh and odl-netconf-console are not compatible with 3node deployment. -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-mdsal</artifactId>
@@ -264,6 +295,18 @@
             <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>
@@ -413,5 +456,13 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Unimgr -->
+        <dependency>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>odl-unimgr</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index f472cb0e..137d0b91 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -43,8 +43,6 @@
         <!-- Keep distribution-atrifacts updated. -->
         <module>odl-distribution-version</module>
         <module>odl-integration-compatible-with-all</module>
-        <module>odl-integration-compatible-with-1node</module>
-        <module>odl-integration-compatible-with-3node</module>
         <module>odl-integration-all</module>
     </modules>
 </project>
-- 
2.36.6