From ccf054185c2fd90fa98a650f981630d1f1698c00 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 30 Dec 2015 11:38:09 -0500
Subject: [PATCH] Reorganize features to remove unnecessary poms

Since integration/distribution only has 2 features reorganize them up
one level so that we can remove the unnecessary features/pom.xml to reduce
maintenance cost of this repo.

Change-Id: I82dc2292d5958e28333bd882e765d8ad06832421
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 {features/index => features-index}/pom.xml    |  0
 .../src/main/resources/features.xml           |  0
 {features/test => features-test}/pom.xml      |  0
 .../src/main/resources/features.xml           |  0
 features/pom.xml                              | 25 -------------------
 pom.xml                                       |  3 ++-
 6 files changed, 2 insertions(+), 26 deletions(-)
 rename {features/index => features-index}/pom.xml (100%)
 rename {features/index => features-index}/src/main/resources/features.xml (100%)
 rename {features/test => features-test}/pom.xml (100%)
 rename {features/test => features-test}/src/main/resources/features.xml (100%)
 delete mode 100644 features/pom.xml

diff --git a/features/index/pom.xml b/features-index/pom.xml
similarity index 100%
rename from features/index/pom.xml
rename to features-index/pom.xml
diff --git a/features/index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
similarity index 100%
rename from features/index/src/main/resources/features.xml
rename to features-index/src/main/resources/features.xml
diff --git a/features/test/pom.xml b/features-test/pom.xml
similarity index 100%
rename from features/test/pom.xml
rename to features-test/pom.xml
diff --git a/features/test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
similarity index 100%
rename from features/test/src/main/resources/features.xml
rename to features-test/src/main/resources/features.xml
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644
index 1454fb30..00000000
--- a/features/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2013 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 INTERNAL
--->
-<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">
-  <parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>root</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <artifactId>features-integration-aggregator</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-
-  <modules>
-    <module>index</module>
-    <module>test</module>
-  </modules>
-</project>
diff --git a/pom.xml b/pom.xml
index 64bb1898..4cb96b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,8 @@
 
   <modules>
     <module>distribution-karaf</module>
-    <module>features</module>
+    <module>features-index</module>
+    <module>features-test</module>
   </modules>
 
   <build>
-- 
2.36.6