Moved commons/ to commons/parent

Allows for things like a local commons/checkstyle etc.

Change-Id: I920af99eec7ea4af051fcd90f60ac6ef698c7889
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/README b/README
index 1401a994b5daf1740cd8717719f864b630a3023a..4f9664a00f0878ea18d93544a416696122415ada 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 DIRECTORY ORGANIZATION
 ======================
 
-- commons: contains the parent pom.xml for all ovsdb projects.
+- commons/parent: contains the parent pom.xml for all ovsdb projects.
 - ovsdb: contains the ovsdb SB plugin
 - distribution/opendaylight: will build a working controller distribution
   based on the controller + ovsdb modules
@@ -12,12 +12,12 @@ HOW TO BUILD
 In order to build it's required to have JDK 1.7+ and Maven 3+, to get
 a build going it's needed to:
 
-cd commons/
+cd commons/parent
 mvn clean install
 
 or if you want to avoid SNAPSHOT checking
 
-cd commons/
+cd commons/parent
 mvn clean install -nsu
 
 HOW TO RUN

diff --git a/commons/pom.xml b/commons/parent/pom.xml
similarity index 96%
rename from commons/pom.xml
rename to commons/parent/pom.xml
index bd66993b1933680b3bf7a7e44b39163299b22360..769aa938a08034cf92a5427e5d918c59ee304820 100755 (executable)
--- a/commons/pom.xml
+++ b/commons/parent/pom.xml
@@ -23,8 +23,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <modules>
-    <module>../ovsdb/</module>
-    <module>../distribution/opendaylight</module>
+    <module>../../ovsdb/</module>
+    <module>../../distribution/opendaylight</module>
   </modules>
   <repositories>
     <!-- jsonrpc4j mirror -->

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
index 15509b8a157a42536a54f3a142cf511ab21a9174..18beff7dc0682a53461d87c09c78ed75bfcc954d 100755 (executable)
--- a/distribution/opendaylight/pom.xml
+++ b/distribution/opendaylight/pom.xml
@@ -11,7 +11,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <groupId>org.opendaylight.ovsdb</groupId>
     <artifactId>commons.ovsdb</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../commons/</relativePath>
+    <relativePath>../../commons/parent/</relativePath>
   </parent>
 
   <artifactId>distribution.ovsdb</artifactId>

diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml
index 932aa901c5b6d00f8377e69816bbf2d6883d2d2d..1709a3609f420c6d356965c9b0ec1bc7b88d1743 100755 (executable)
--- a/ovsdb/pom.xml
+++ b/ovsdb/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.ovsdb</groupId>
     <artifactId>commons.ovsdb</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../commons</relativePath>
+    <relativePath>../commons/parent/</relativePath>
   </parent>
   <artifactId>ovsdb</artifactId>
   <version>0.4.0-SNAPSHOT</version>