Move models to top-level directory 03/93303/2
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 23 Oct 2020 14:57:35 +0000 (16:57 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 23 Oct 2020 14:59:58 +0000 (16:59 +0200)
Having the 'opendaylight' indirection is useless, move the models
first as we expect few changes to them. Also cleanup module order
in top-level aggragator.

Change-Id: Ibbdcc6c68f643f13e58741ab5e59b4724693806c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
model/model-inventory/pom.xml [moved from opendaylight/model/model-inventory/pom.xml with 100% similarity]
model/model-inventory/src/main/yang/opendaylight-inventory.yang [moved from opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang with 100% similarity]
model/model-topology/pom.xml [moved from opendaylight/model/model-topology/pom.xml with 96% similarity]
model/model-topology/src/main/yang/opendaylight-topology-inventory.yang [moved from opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang with 100% similarity]
model/model-topology/src/main/yang/opendaylight-topology-view.yang [moved from opendaylight/model/model-topology/src/main/yang/opendaylight-topology-view.yang with 100% similarity]
model/model-topology/src/main/yang/opendaylight-topology.yang [moved from opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang with 100% similarity]
model/pom.xml [moved from opendaylight/model/pom.xml with 100% similarity]
pom.xml

similarity index 96%
rename from opendaylight/model/model-topology/pom.xml
rename to model/model-topology/pom.xml
index 6e3fe7e..2ce9757 100644 (file)
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
         <version>3.0.2-SNAPSHOT</version>
-        <relativePath>../../md-sal/parent</relativePath>
+        <relativePath>../opendaylight/md-sal/parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller.model</groupId>
similarity index 100%
rename from opendaylight/model/pom.xml
rename to model/pom.xml
diff --git a/pom.xml b/pom.xml
index 064fac1..748492f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
 
   <modules>
     <module>artifacts</module>
-    <module>bundle-parent</module>
+    <module>docs</module>
+    <module>features</module>
+    <module>karaf</module>
+
     <module>akka</module>
+    <module>bundle-parent</module>
+    <module>benchmark</module>
+    <module>model</module>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>
     <!-- config -->
     <module>opendaylight/config</module>
 
-    <module>opendaylight/model</module>
-
     <module>opendaylight/blueprint</module>
 
     <!-- Parents -->
-    <module>benchmark</module>
     <module>opendaylight/commons/jolokia</module>
-
-    <!-- Karaf Distribution -->
-    <module>karaf</module>
-    <module>features</module>
-
-    <!-- documentation -->
-    <module>docs</module>
   </modules>
 
   <profiles>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.