From 39134ee9497bbb348f1575f0c1857053d5d21e64 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 3 Oct 2018 18:14:30 +0200
Subject: [PATCH] Move model features into top-level directory

This eliminates the second feature directory, concentrating all
features in one place.

Change-Id: Idb86b943d59cf5ad532dda8675b9fc2e781e692e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../pom.xml                                   |  0
 .../pom.xml                                   |  0
 .../pom.xml                                   |  0
 .../pom.xml                                   |  0
 .../pom.xml                                   |  0
 .../pom.xml                                   |  0
 .../odl-mdsal-model-odl-l2-types/pom.xml      |  0
 .../odl-mdsal-model-rfc6991/pom.xml           |  0
 .../odl-mdsal-model-rfc7223/pom.xml           |  0
 .../odl-mdsal-model-rfc7224/pom.xml           |  0
 .../odl-mdsal-model-rfc7277/pom.xml           |  0
 .../odl-mdsal-model-rfc7895/pom.xml           |  0
 .../odl-mdsal-model-rfc7952/pom.xml           |  0
 .../odl-mdsal-model-rfc8294/pom.xml           |  0
 .../odl-mdsal-model-rfc8342/pom.xml           |  0
 .../odl-mdsal-model-rfc8343/pom.xml           |  0
 .../odl-mdsal-model-rfc8344/pom.xml           |  0
 .../odl-mdsal-model-rfc8345-non-nmda/pom.xml  |  0
 .../odl-mdsal-model-rfc8345/pom.xml           |  0
 .../odl-mdsal-model-rfc8348-non-nmda/pom.xml  |  0
 .../odl-mdsal-model-rfc8348/pom.xml           |  0
 .../odl-mdsal-model-rfc8349/pom.xml           |  0
 features/pom.xml                              | 29 ++++++++++
 model/features/pom.xml                        | 53 -------------------
 model/pom.xml                                 |  1 -
 25 files changed, 29 insertions(+), 54 deletions(-)
 rename {model/features => features}/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-odl-l2-types/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc6991/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc7223/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc7224/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc7277/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc7895/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc7952/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8294/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8342/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8343/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8344/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8345-non-nmda/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8345/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8348-non-nmda/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8348/pom.xml (100%)
 rename {model/features => features}/odl-mdsal-model-rfc8349/pom.xml (100%)
 delete mode 100644 model/features/pom.xml

diff --git a/model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml b/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
rename to features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
diff --git a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml b/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
rename to features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
diff --git a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml b/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
rename to features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
diff --git a/model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml b/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
rename to features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
diff --git a/model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml b/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
rename to features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
diff --git a/model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml b/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
rename to features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
diff --git a/model/features/odl-mdsal-model-odl-l2-types/pom.xml b/features/odl-mdsal-model-odl-l2-types/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-odl-l2-types/pom.xml
rename to features/odl-mdsal-model-odl-l2-types/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc6991/pom.xml b/features/odl-mdsal-model-rfc6991/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc6991/pom.xml
rename to features/odl-mdsal-model-rfc6991/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc7223/pom.xml b/features/odl-mdsal-model-rfc7223/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc7223/pom.xml
rename to features/odl-mdsal-model-rfc7223/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc7224/pom.xml b/features/odl-mdsal-model-rfc7224/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc7224/pom.xml
rename to features/odl-mdsal-model-rfc7224/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc7277/pom.xml b/features/odl-mdsal-model-rfc7277/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc7277/pom.xml
rename to features/odl-mdsal-model-rfc7277/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc7895/pom.xml b/features/odl-mdsal-model-rfc7895/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc7895/pom.xml
rename to features/odl-mdsal-model-rfc7895/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc7952/pom.xml b/features/odl-mdsal-model-rfc7952/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc7952/pom.xml
rename to features/odl-mdsal-model-rfc7952/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8294/pom.xml b/features/odl-mdsal-model-rfc8294/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8294/pom.xml
rename to features/odl-mdsal-model-rfc8294/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8342/pom.xml b/features/odl-mdsal-model-rfc8342/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8342/pom.xml
rename to features/odl-mdsal-model-rfc8342/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8343/pom.xml b/features/odl-mdsal-model-rfc8343/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8343/pom.xml
rename to features/odl-mdsal-model-rfc8343/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8344/pom.xml b/features/odl-mdsal-model-rfc8344/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8344/pom.xml
rename to features/odl-mdsal-model-rfc8344/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml b/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
rename to features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8345/pom.xml b/features/odl-mdsal-model-rfc8345/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8345/pom.xml
rename to features/odl-mdsal-model-rfc8345/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml b/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
rename to features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8348/pom.xml b/features/odl-mdsal-model-rfc8348/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8348/pom.xml
rename to features/odl-mdsal-model-rfc8348/pom.xml
diff --git a/model/features/odl-mdsal-model-rfc8349/pom.xml b/features/odl-mdsal-model-rfc8349/pom.xml
similarity index 100%
rename from model/features/odl-mdsal-model-rfc8349/pom.xml
rename to features/odl-mdsal-model-rfc8349/pom.xml
diff --git a/features/pom.xml b/features/pom.xml
index a76c86d6c8..d505e125bb 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -54,5 +54,34 @@
         <!-- Singleton -->
         <module>odl-mdsal-singleton-common</module>
         <module>odl-mdsal-singleton-dom</module>
+
+        <!-- Models -->
+        <!-- Standards -->
+        <module>odl-mdsal-model-rfc6991</module>
+        <module>odl-mdsal-model-rfc7223</module>
+        <module>odl-mdsal-model-rfc7224</module>
+        <module>odl-mdsal-model-rfc7277</module>
+        <module>odl-mdsal-model-rfc7895</module>
+        <module>odl-mdsal-model-rfc7952</module>
+        <module>odl-mdsal-model-rfc8294</module>
+        <module>odl-mdsal-model-rfc8342</module>
+        <module>odl-mdsal-model-rfc8343</module>
+        <module>odl-mdsal-model-rfc8344</module>
+        <module>odl-mdsal-model-rfc8345</module>
+        <module>odl-mdsal-model-rfc8345-non-nmda</module>
+        <module>odl-mdsal-model-rfc8348</module>
+        <module>odl-mdsal-model-rfc8348-non-nmda</module>
+        <module>odl-mdsal-model-rfc8349</module>
+
+        <!-- IETF drafts -->
+        <module>odl-mdsal-model-draft-bierman-netconf-restconf-02</module>
+        <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</module>
+        <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</module>
+        <module>odl-mdsal-model-draft-ietf-lisp-lcaf-10</module>
+        <module>odl-mdsal-model-draft-ietf-netmod-acl-model-07</module>
+        <module>odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00</module>
+
+        <!-- OpenDaylight-specific -->
+        <module>odl-mdsal-model-odl-l2-types</module>
     </modules>
 </project>
diff --git a/model/features/pom.xml b/model/features/pom.xml
deleted file mode 100644
index e82e551a04..0000000000
--- a/model/features/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 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>odlparent-lite</artifactId>
-        <version>4.0.2</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>features-mdsal-model-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <!-- Standards -->
-        <module>odl-mdsal-model-rfc6991</module>
-        <module>odl-mdsal-model-rfc7223</module>
-        <module>odl-mdsal-model-rfc7224</module>
-        <module>odl-mdsal-model-rfc7277</module>
-        <module>odl-mdsal-model-rfc7895</module>
-        <module>odl-mdsal-model-rfc7952</module>
-        <module>odl-mdsal-model-rfc8294</module>
-        <module>odl-mdsal-model-rfc8342</module>
-        <module>odl-mdsal-model-rfc8343</module>
-        <module>odl-mdsal-model-rfc8344</module>
-        <module>odl-mdsal-model-rfc8345</module>
-        <module>odl-mdsal-model-rfc8345-non-nmda</module>
-        <module>odl-mdsal-model-rfc8348</module>
-        <module>odl-mdsal-model-rfc8348-non-nmda</module>
-        <module>odl-mdsal-model-rfc8349</module>
-
-        <!-- IETF drafts -->
-        <module>odl-mdsal-model-draft-bierman-netconf-restconf-02</module>
-        <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</module>
-        <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</module>
-        <module>odl-mdsal-model-draft-ietf-lisp-lcaf-10</module>
-        <module>odl-mdsal-model-draft-ietf-netmod-acl-model-07</module>
-        <module>odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00</module>
-
-        <!-- OpenDaylight-specific -->
-        <module>odl-mdsal-model-odl-l2-types</module>
-    </modules>
-</project>
diff --git a/model/pom.xml b/model/pom.xml
index c00fd5f9a9..6781e31911 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -25,7 +25,6 @@
     <description>${project.artifactId}</description>
 
     <modules>
-        <module>features</module>
         <module>yang-ext</module>
         <module>iana</module>
         <module>ietf</module>
-- 
2.36.6