From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 23 Oct 2020 15:01:13 +0000 (+0200)
Subject: Move jolokia to top-level directory
X-Git-Tag: v3.0.2~18
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1413d39efa41e0b3926e400dbd7ef5e3fac694c2

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 748492f925..40f7011245 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <module>akka</module>
     <module>bundle-parent</module>
     <module>benchmark</module>
+    <module>jolokia</module>
     <module>model</module>
 
     <!-- md-sal -->
@@ -37,9 +38,6 @@
     <module>opendaylight/config</module>
 
     <module>opendaylight/blueprint</module>
-
-    <!-- Parents -->
-    <module>opendaylight/commons/jolokia</module>
   </modules>
 
   <profiles>