From 56749191cb8d6181f1a9eeb303269c1c2166e897 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 14 Feb 2017 10:19:16 +0100
Subject: [PATCH] Move features to top level

Since our structure is more flat than it used to be there is no
need to keep features in common directory.

Change-Id: I59c8a97f3b93ae0a8fc350f866541ae93c8dd539
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 common/pom.xml                                                   | 1 -
 {common/features => features}/features-yangtools/pom.xml         | 0
 .../features-yangtools/src/main/features/features.xml            | 0
 {common/features => features}/features4-yangtools/pom.xml        | 0
 {common/features => features}/odl-yangtools-common/pom.xml       | 0
 {common/features => features}/odl-yangtools-yang-data/pom.xml    | 0
 {common/features => features}/odl-yangtools-yang-parser/pom.xml  | 0
 {common/features => features}/pom.xml                            | 0
 pom.xml                                                          | 1 +
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename {common/features => features}/features-yangtools/pom.xml (100%)
 rename {common/features => features}/features-yangtools/src/main/features/features.xml (100%)
 rename {common/features => features}/features4-yangtools/pom.xml (100%)
 rename {common/features => features}/odl-yangtools-common/pom.xml (100%)
 rename {common/features => features}/odl-yangtools-yang-data/pom.xml (100%)
 rename {common/features => features}/odl-yangtools-yang-parser/pom.xml (100%)
 rename {common/features => features}/pom.xml (100%)

diff --git a/common/pom.xml b/common/pom.xml
index e207bcbeef..42d1dc2735 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -26,7 +26,6 @@
         <module>artifacts</module>
         <module>checkstyle-logging</module>
         <module>concepts</module>
-        <module>features</module>
         <module>mockito-configuration</module>
         <module>object-cache-api</module>
         <module>object-cache-guava</module>
diff --git a/common/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
similarity index 100%
rename from common/features/features-yangtools/pom.xml
rename to features/features-yangtools/pom.xml
diff --git a/common/features/features-yangtools/src/main/features/features.xml b/features/features-yangtools/src/main/features/features.xml
similarity index 100%
rename from common/features/features-yangtools/src/main/features/features.xml
rename to features/features-yangtools/src/main/features/features.xml
diff --git a/common/features/features4-yangtools/pom.xml b/features/features4-yangtools/pom.xml
similarity index 100%
rename from common/features/features4-yangtools/pom.xml
rename to features/features4-yangtools/pom.xml
diff --git a/common/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
similarity index 100%
rename from common/features/odl-yangtools-common/pom.xml
rename to features/odl-yangtools-common/pom.xml
diff --git a/common/features/odl-yangtools-yang-data/pom.xml b/features/odl-yangtools-yang-data/pom.xml
similarity index 100%
rename from common/features/odl-yangtools-yang-data/pom.xml
rename to features/odl-yangtools-yang-data/pom.xml
diff --git a/common/features/odl-yangtools-yang-parser/pom.xml b/features/odl-yangtools-yang-parser/pom.xml
similarity index 100%
rename from common/features/odl-yangtools-yang-parser/pom.xml
rename to features/odl-yangtools-yang-parser/pom.xml
diff --git a/common/features/pom.xml b/features/pom.xml
similarity index 100%
rename from common/features/pom.xml
rename to features/pom.xml
diff --git a/pom.xml b/pom.xml
index 008808c30d..aa771ccefc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 
     <modules>
         <module>common</module>
+        <module>features</module>
         <module>yang</module>
         <module>websocket</module>
         <module>yang-validation-tool</module>
-- 
2.36.6