Move jolokia to top-level directory

There is no point in keeping opendaylight/commons indirection,
move this artifact to the top-level directory.

Change-Id: Ic55ceeeb103b4a8f6f3ed44de4c703bd2349ee47
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/commons/jolokia/pom.xml b/jolokia/pom.xml
similarity index 100%
rename from opendaylight/commons/jolokia/pom.xml
rename to jolokia/pom.xml

diff --git a/opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg b/jolokia/src/main/resources/org.jolokia.osgi.cfg
similarity index 100%
rename from opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg
rename to jolokia/src/main/resources/org.jolokia.osgi.cfg

diff --git a/pom.xml b/pom.xml
index 748492f925949ad3e7faf3023cfbe576848b5dd3..40f70112450c8c8212dad8b98ebab7e025272011 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <module>akka</module>
     <module>bundle-parent</module>
     <module>benchmark</module>
     <module>akka</module>
     <module>bundle-parent</module>
     <module>benchmark</module>

+    <module>jolokia</module>

     <module>model</module>
 
     <!-- md-sal -->
     <module>model</module>
 
     <!-- md-sal -->


@@ -37,9 +38,6 @@
     <module>opendaylight/config</module>
 
     <module>opendaylight/blueprint</module>
     <module>opendaylight/config</module>
 
     <module>opendaylight/blueprint</module>

-
-    <!-- Parents -->
-    <module>opendaylight/commons/jolokia</module>

   </modules>
 
   <profiles>
   </modules>
 
   <profiles>