Clean projects did not make oxygen

eman, faas, nic, ocpplugin, unimgr, vtn

Change-Id: I4bcaf91ed6c20614cec77038d4f831606c1f2322
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index aff1061327ccd037cff7a7b623314b64b446bb10..7f1eb24367e204cff84670ff6bbd12ea801e3894 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -316,23 +316,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <profile>
-            <id>unimgr</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.unimgr</groupId>
-                        <artifactId>unimgr-artifacts</artifactId>
-                        <version>${unimgr.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 005a28887ecd53206847d5810d56087cc90c99ad..36d5ae57c9a8f9bf6520517a527e38582f3bae54 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -170,44 +170,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- Eman -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-        <profile>
-            <id>eman</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.eman</groupId>
-                        <artifactId>features-eman</artifactId>
-                        <version>${eman.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- FaaS -->
-        <profile>
-            <id>faas</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>features4-faas</artifactId>
-                        <version>${faas.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- InfraUtils -->
         <profile>
             <id>infrautils</id>
@@ -262,44 +224,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- NIC -->
-        <profile>
-            <id>nic</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.nic</groupId>
-                        <artifactId>features-nic</artifactId>
-                        <version>${nic.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- OCP Plugin -->
-        <profile>
-            <id>ocpplugin</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.ocpplugin</groupId>
-                        <artifactId>features-ocpplugin</artifactId>
-                        <version>${ocpplugin.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- ODL Parent -->
         <profile>
             <id>odlparent</id>
@@ -469,23 +393,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.vtn</groupId>
-                        <artifactId>features-vtn-manager</artifactId>
-                        <version>${vtn-manager.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 5102e4ef048a453908461d82d40d83531c6dedf4..504d7e3dbdc622faec655088ae5f278521579f20 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -55,8 +55,6 @@
         <didm.version>0.6.1-SNAPSHOT</didm.version>
         <dlux.version>0.7.1-SNAPSHOT</dlux.version>
         <dluxapps.version>0.7.1-SNAPSHOT</dluxapps.version>
-        <eman.version>1.3.1-SNAPSHOT</eman.version>
-        <faas.version>1.4.1-SNAPSHOT</faas.version>
         <federation.version>0.4.1-SNAPSHOT</federation.version>
         <flow.version>1.7.1-SNAPSHOT</flow.version>
         <genius.version>0.4.1-SNAPSHOT</genius.version>
@@ -73,9 +71,7 @@
         <netconf.version>1.4.1-SNAPSHOT</netconf.version>
         <netide.version>0.5.1-SNAPSHOT</netide.version>
         <netvirt.version>0.6.1-SNAPSHOT</netvirt.version>
-        <nic.version>1.5.1-SNAPSHOT</nic.version>
         <neutron.version>0.10.1-SNAPSHOT</neutron.version>
-        <ocpplugin.version>0.4.1-SNAPSHOT</ocpplugin.version>
         <odlparent.version>3.1.0</odlparent.version>
         <ofconfig.version>1.4.1-SNAPSHOT</ofconfig.version>
         <openflowplugin.version>0.6.1-SNAPSHOT</openflowplugin.version>
@@ -89,9 +85,7 @@
         <snmp4sdn.version>0.7.1-SNAPSHOT</snmp4sdn.version>
         <sxp.version>1.6.1-SNAPSHOT</sxp.version>
         <tsdr.version>1.5.1-SNAPSHOT</tsdr.version>
-        <unimgr.version>0.4.1-SNAPSHOT</unimgr.version>
         <usc.version>1.5.1-SNAPSHOT</usc.version>
-        <vtn-manager.version>0.8.1-SNAPSHOT</vtn-manager.version>
         <yangtools.version>2.0.3</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index fcaeab6a81f8177845be4faae44d30ae445a250b..02a70a5c4bad8f919bb93a1d2ac369c6692bc33c 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -187,107 +187,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- Eman -->
-        <profile>
-            <id>eman</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.eman</groupId>
-                        <artifactId>odl-eman-ui</artifactId>
-                        <version>${eman.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.eman</groupId>
-                        <artifactId>odl-eman-api</artifactId>
-                        <version>${eman.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.eman</groupId>
-                        <artifactId>odl-eman</artifactId>
-                        <version>${eman.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- FAAS -->
-        <profile>
-            <id>faas</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-base</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-vxlan-ovs-adapter</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-vxlan-fabric</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-vlan-fabric</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-fabric</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-fabricmgr</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-uln-mapper</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>odl-faas-all</artifactId>
-                        <version>${faas.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- JSON RPC -->
         <profile>
             <id>jsonrpc</id>
@@ -384,51 +283,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- NIC -->
-        <profile>
-            <id>nic</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.nic</groupId>
-                        <artifactId>odl-nic-intent-common</artifactId>
-                        <version>${nic.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.nic</groupId>
-                        <artifactId>odl-nic-core-mdsal</artifactId>
-                        <version>${nic.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- OCP Plugin -->
-        <profile>
-            <id>ocpplugin</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.ocpplugin</groupId>
-                        <artifactId>odl-ocpplugin-all</artifactId>
-                        <version>${ocpplugin.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- OF-CONFIG -->
         <profile>
             <id>ofconfig</id>
@@ -625,25 +479,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- UNIMGR -->
-        <profile>
-            <id>unimgr</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.unimgr</groupId>
-                        <artifactId>odl-unimgr</artifactId>
-                        <version>${unimgr.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- USC -->
         <profile>
             <id>usc</id>
@@ -662,30 +497,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.vtn</groupId>
-                        <artifactId>odl-vtn-manager-rest</artifactId>
-                        <version>${vtn-manager.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.vtn</groupId>
-                        <artifactId>odl-vtn-manager-neutron</artifactId>
-                        <version>${vtn-manager.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 31a228d9632d48137949b03a8516f9f7adf1c67b..34d91fd54f57cafde814dc224eb64bedb395a71c 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -245,38 +245,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Eman -->
-        <profile>
-            <id>eman</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.eman</groupId>
-                    <artifactId>features-eman</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- FAAS -->
-        <profile>
-            <id>faas</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.faas</groupId>
-                    <artifactId>features4-faas</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Genius -->
         <profile>
             <id>genius</id>
@@ -461,38 +429,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- NIC -->
-        <profile>
-            <id>nic</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.nic</groupId>
-                    <artifactId>features-nic</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- OCPplugin -->
-        <profile>
-            <id>ocpplugin</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.ocpplugin</groupId>
-                    <artifactId>features-ocpplugin</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- ODL Parent -->
         <profile>
             <id>odlparent</id>
@@ -682,22 +618,6 @@
                 </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>features4-unimgr</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- USC -->
         <profile>
             <id>usc</id>
@@ -713,21 +633,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.vtn</groupId>
-                    <artifactId>features-vtn-manager</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- FIXME: Add Yangtools -->
     </profiles>
 </project>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 1972048052b9af03cf575e43a4fa997eefd88db2..66c8cf3d9f0491ff09bfdbeaf8d0e3b33ceb9898 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -90,22 +90,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>
@@ -438,22 +422,6 @@
                 </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>
@@ -469,26 +437,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.vtn</groupId>
-                    <artifactId>odl-vtn-manager-rest</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.vtn</groupId>
-                    <artifactId>odl-vtn-manager-neutron</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index ed420e924a8f4f6fe1ed24c2fd51fa7707c39a95..040d61c917f1ffb4f34a2cb1276980007759b327 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -276,38 +276,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>