Merge remote branch 'origin/release-1.0.X' into develop

Change-Id: Ia307d59e64e5b94972267aec152854df2d1f1a06
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 894f928de5f7ed3272b2e5480dc9863501469b46..47148451def116333c5a7ef05b5c857a24b2d422 100644 (file)
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,14 +21,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <tag>HEAD</tag>
   </scm>
 
-  <modules>
-    <module>../commons/parent</module>
-    <module>../commons/build_tools</module>
-    <module>../commons/code-parent</module>
-    <module>../commons/unittest_tools</module>
-    <module>../mappingservice</module>
-  </modules>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/pom.xml b/pom.xml
index b78fd28dc1ce43a45faf16765b1f324e5554ea2b..ba7e7336a06d5319164f78a80401c1309f2aaf23 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <module>commons/code-parent</module>
     <module>commons/unittest_tools</module>
     <module>mappingservice</module>
+    <module>distribution</module>
   </modules>
 
   <build>