From a000b4320f9176e6d1401e3022ec1b997e2b1648 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 30 Dec 2015 11:32:05 -0500
Subject: [PATCH] Reorganize karaf distribution

Karaf is now the only supported distribution so reorganize the directory
structure to remove unnecessary poms.

Change-Id: If6ac687f74bd5a9f30aa57ab4084bb481999dbe2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 .../karaf => distribution-karaf}/pom.xml      |  0
 .../main/assembly/bin/configure_cluster.sh    |  0
 .../assembly/etc/org.ops4j.pax.url.mvn.cfg    |  0
 distributions/pom.xml                         | 42 -------------------
 pom.xml                                       |  5 ++-
 5 files changed, 3 insertions(+), 44 deletions(-)
 rename {distributions/karaf => distribution-karaf}/pom.xml (100%)
 rename {distributions/karaf => distribution-karaf}/src/main/assembly/bin/configure_cluster.sh (100%)
 rename {distributions/karaf => distribution-karaf}/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg (100%)
 delete mode 100644 distributions/pom.xml

diff --git a/distributions/karaf/pom.xml b/distribution-karaf/pom.xml
similarity index 100%
rename from distributions/karaf/pom.xml
rename to distribution-karaf/pom.xml
diff --git a/distributions/karaf/src/main/assembly/bin/configure_cluster.sh b/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
similarity index 100%
rename from distributions/karaf/src/main/assembly/bin/configure_cluster.sh
rename to distribution-karaf/src/main/assembly/bin/configure_cluster.sh
diff --git a/distributions/karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
similarity index 100%
rename from distributions/karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
rename to distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
diff --git a/distributions/pom.xml b/distributions/pom.xml
deleted file mode 100644
index 99f7c733..00000000
--- a/distributions/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.integration</groupId>
-    <artifactId>root</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <artifactId>distributions</artifactId>
-  <name>OpenDaylight Distributions</name>
-  <packaging>pom</packaging>
-  <modules>
-    <module>karaf</module>
-  </modules>
-  <profiles>
-    <profile>
-      <id>dependencyConvergence</id>
-      <build>
-        <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>Dependency-Convergence</id>
-              <goals>
-                <goal>enforce</goal>
-              </goals>
-              <configuration>
-                <rules>
-                  <DependencyConvergence />
-                </rules>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/pom.xml b/pom.xml
index 7117fca0..64bb1898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,10 @@
     <snmp.plugin.version>1.1.0-SNAPSHOT</snmp.plugin.version>
     <!-- Keep this list sorted alphabetically please -->
   </properties>
+
   <modules>
-    <module>distributions/</module>
-    <module>features/</module>
+    <module>distribution-karaf</module>
+    <module>features</module>
   </modules>
 
   <build>
-- 
2.36.6