diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6a0a802587..758c83bba3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - "graylog-repackaging"
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
 jobs:
   build:
     name: "Build"
@@ -14,10 +18,10 @@ jobs:
     strategy:
       matrix:
         java-version:
-          - "8"
+          - "17"
 
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
 
       - name: "Set up JDK ${{ matrix.version }}"
         uses: "actions/setup-java@v3"
@@ -28,5 +32,8 @@ jobs:
 
       - name: "Build"
         shell: "bash"
+        env:
+          MAVEN_ARGS: "--show-version --batch-mode --fail-fast --no-transfer-progress"
+          MAVEN_OPTS: "-Dstyle.color=always -DtrimStackTrace=false"
         run: |
-          mvn --show-version --batch-mode --fail-fast clean package
+          mvn clean package
diff --git a/modules/siddhi-core/pom.xml b/modules/siddhi-core/pom.xml
index 9bb88bf427..525b865e6d 100644
--- a/modules/siddhi-core/pom.xml
+++ b/modules/siddhi-core/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.apache.log4j.wso2</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.orbit.com.lmax</groupId>
             <artifactId>disruptor</artifactId>
@@ -60,6 +56,11 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -69,12 +70,12 @@
             <artifactId>metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-jmx</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
@@ -84,6 +85,10 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.atteo.classindex</groupId>
+            <artifactId>classindex</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -132,4 +137,4 @@
         <mavan.findbugsplugin.exclude.file>../../findbugs-exclude.xml</mavan.findbugsplugin.exclude.file>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/memory/ObjectSizeCalculator.java b/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/memory/ObjectSizeCalculator.java
deleted file mode 100644
index 8b909fca9f..0000000000
--- a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/memory/ObjectSizeCalculator.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.siddhi.core.util.statistics.memory;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Sets;
-import org.apache.log4j.Logger;
-import org.wso2.siddhi.core.config.SiddhiAppContext;
-import org.wso2.siddhi.core.query.output.callback.OutputCallback;
-import org.wso2.siddhi.core.stream.StreamJunction;
-import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.table.record.AbstractRecordTable;
-import org.wso2.siddhi.core.util.statistics.BufferedEventsTracker;
-import org.wso2.siddhi.core.util.statistics.LatencyTracker;
-import org.wso2.siddhi.core.util.statistics.MemoryCalculable;
-import org.wso2.siddhi.core.util.statistics.MemoryUsageTracker;
-import org.wso2.siddhi.core.util.statistics.StatisticsManager;
-import org.wso2.siddhi.core.util.statistics.ThroughputTracker;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Contains utility methods for calculating the memory usage of objects. It
- * only works on the HotSpot JVM, and infers the actual memory layout (32 bit
- * vs. 64 bit word size, compressed object pointers vs. uncompressed) from
- * best available indicators. It can reliably detect a 32 bit vs. 64 bit JVM.
- * It can only make an educated guess at whether compressed OOPs are used,
- * though; specifically, it knows what the JVM's default choice of OOP
- * compression would be based on HotSpot version and maximum heap sizes, but if
- * the choice is explicitly overridden with the <tt>-XX:{+|-}UseCompressedOops</tt>
- * command line switch, it can not detect this fact and will report incorrect sizes,
- * as it will presume the default JVM behavior.
- *
- * @author Attila Szegedi
- */
-public class ObjectSizeCalculator {
-    private static final Logger log = Logger.getLogger(ObjectSizeCalculator.class);
-
-    // Fixed object header size for arrays.
-    private final int arrayHeaderSize;
-    // Fixed object header size for non-array objects.
-    private final int objectHeaderSize;
-    // Padding for the object size - if the object size is not an exact multiple of this,
-    // it's padded to the next multiple.
-    private final int objectPadding;
-    // Size of reference (pointer) fields.
-    private final int referenceSize;
-    // Padding for the fields of superclass before fields of subclasses are added.
-    private final int superclassFieldPadding;
-    private final LoadingCache<Class<?>, ClassSizeInfo> classSizeInfos =
-            CacheBuilder.newBuilder().build(new CacheLoader<Class<?>, ClassSizeInfo>() {
-                public ClassSizeInfo load(Class<?> clazz) {
-                    return new ClassSizeInfo(clazz);
-                }
-            });
-    private final Set<Class> ignoreCalculation = Sets.newIdentityHashSet();
-    private final Set<Object> alreadyVisited = Sets.newIdentityHashSet();
-    private final Deque<Object> pending = new ArrayDeque<Object>(16 * 1024);
-    private long size;
-
-
-    /**
-     * Creates an object size calculator that can calculate object sizes for a given
-     * {@code memoryLayoutSpecification}.
-     *
-     * @param memoryLayoutSpecification a description of the JVM memory layout.
-     */
-    public ObjectSizeCalculator(MemoryLayoutSpecification memoryLayoutSpecification) {
-        Preconditions.checkNotNull(memoryLayoutSpecification);
-        arrayHeaderSize = memoryLayoutSpecification.getArrayHeaderSize();
-        objectHeaderSize = memoryLayoutSpecification.getObjectHeaderSize();
-        objectPadding = memoryLayoutSpecification.getObjectPadding();
-        referenceSize = memoryLayoutSpecification.getReferenceSize();
-        superclassFieldPadding = memoryLayoutSpecification.getSuperclassFieldPadding();
-        ignoreCalculation.add(SiddhiAppContext.class);
-        ignoreCalculation.add(StreamJunction.class);
-        ignoreCalculation.add(OutputCallback.class);
-        ignoreCalculation.add(StreamCallback.class);
-        ignoreCalculation.add(ThroughputTracker.class);
-        ignoreCalculation.add(LatencyTracker.class);
-        ignoreCalculation.add(MemoryUsageTracker.class);
-        ignoreCalculation.add(BufferedEventsTracker.class);
-        ignoreCalculation.add(StatisticsManager.class);
-        ignoreCalculation.add(MemoryCalculable.class);
-        ignoreCalculation.add(AbstractRecordTable.class);
-    }
-
-    /**
-     * Given an object, returns the total allocated size, in bytes, of the object
-     * and all other objects reachable from it.  Attempts to to detect the current JVM memory layout,
-     * but may fail with {@link UnsupportedOperationException};
-     *
-     * @param obj the object; can be null. Passing in a {@link java.lang.Class} object doesn't do
-     *            anything special, it measures the size of all objects
-     *            reachable through it (which will include its class loader, and by
-     *            extension, all other Class objects loaded by
-     *            the same loader, and all the parent class loaders). It doesn't provide the
-     *            size of the static fields in the JVM class that the Class object
-     *            represents.
-     * @return the total allocated size of the object and all other objects it
-     * retains.
-     * @throws UnsupportedOperationException if the current vm memory layout cannot be detected.
-     */
-    public static long getObjectSize(Object obj) throws UnsupportedOperationException {
-        return obj == null ? 0 : new ObjectSizeCalculator(CurrentLayout.SPEC).calculateObjectSize(obj);
-    }
-
-    @VisibleForTesting
-    static long roundTo(long x, int multiple) {
-        return ((x + multiple - 1) / multiple) * multiple;
-    }
-
-    private static long getPrimitiveFieldSize(Class<?> type) {
-        if (type == boolean.class || type == byte.class) {
-            return 1;
-        }
-        if (type == char.class || type == short.class) {
-            return 2;
-        }
-        if (type == int.class || type == float.class) {
-            return 4;
-        }
-        if (type == long.class || type == double.class) {
-            return 8;
-        }
-        throw new AssertionError("Encountered unexpected primitive type " + type.getName());
-    }
-
-    @VisibleForTesting
-    static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() {
-        final String vmName = System.getProperty("java.vm.name");
-        if (vmName == null
-                || !(vmName.startsWith("Java HotSpot(TM) ")
-                || vmName.startsWith("OpenJDK")
-                || vmName.startsWith("TwitterJDK"))) {
-            throw new UnsupportedOperationException("ObjectSizeCalculator only supported on HotSpot VM");
-        }
-
-        final String dataModel = System.getProperty("sun.arch.data.model");
-        if ("32".equals(dataModel)) {
-            // Running with 32-bit data model.
-            return new MemoryLayoutSpecification() {
-                @Override
-                public int getArrayHeaderSize() {
-                    return 12;
-                }
-
-                @Override
-                public int getObjectHeaderSize() {
-                    return 8;
-                }
-
-                @Override
-                public int getObjectPadding() {
-                    return 8;
-                }
-
-                @Override
-                public int getReferenceSize() {
-                    return 4;
-                }
-
-                @Override
-                public int getSuperclassFieldPadding() {
-                    return 4;
-                }
-            };
-        } else if (!"64".equals(dataModel)) {
-            throw new UnsupportedOperationException("Unrecognized value '" +
-                    dataModel + "' of sun.arch.data.model system property");
-        }
-
-        final String strVmVersion = System.getProperty("java.vm.version");
-        final int vmVersion = Integer.parseInt(strVmVersion.substring(0, strVmVersion.indexOf('.')));
-        if (vmVersion >= 17) {
-            long maxMemory = 0;
-            for (MemoryPoolMXBean mp : ManagementFactory.getMemoryPoolMXBeans()) {
-                maxMemory += mp.getUsage().getMax();
-            }
-            if (maxMemory < 30L * 1024 * 1024 * 1024) {
-                // HotSpot 17.0 and above use compressed OOPs below 30GB of RAM total
-                // for all memory pools (yes, including code cache).
-                return new MemoryLayoutSpecification() {
-                    @Override
-                    public int getArrayHeaderSize() {
-                        return 16;
-                    }
-
-                    @Override
-                    public int getObjectHeaderSize() {
-                        return 12;
-                    }
-
-                    @Override
-                    public int getObjectPadding() {
-                        return 8;
-                    }
-
-                    @Override
-                    public int getReferenceSize() {
-                        return 4;
-                    }
-
-                    @Override
-                    public int getSuperclassFieldPadding() {
-                        return 4;
-                    }
-                };
-            }
-        }
-
-        // In other cases, it's a 64-bit uncompressed OOPs object model
-        return new MemoryLayoutSpecification() {
-            @Override
-            public int getArrayHeaderSize() {
-                return 24;
-            }
-
-            @Override
-            public int getObjectHeaderSize() {
-                return 16;
-            }
-
-            @Override
-            public int getObjectPadding() {
-                return 8;
-            }
-
-            @Override
-            public int getReferenceSize() {
-                return 8;
-            }
-
-            @Override
-            public int getSuperclassFieldPadding() {
-                return 8;
-            }
-        };
-    }
-
-    /**
-     * Given an object, returns the total allocated size, in bytes, of the object
-     * and all other objects reachable from it.
-     *
-     * @param obj the object; can be null. Passing in a {@link java.lang.Class} object doesn't do
-     *            anything special, it measures the size of all objects
-     *            reachable through it (which will include its class loader, and by
-     *            extension, all other Class objects loaded by
-     *            the same loader, and all the parent class loaders). It doesn't provide the
-     *            size of the static fields in the JVM class that the Class object
-     *            represents.
-     * @return the total allocated size of the object and all other objects it
-     * retains.
-     */
-    public synchronized long calculateObjectSize(Object obj) {
-        boolean isFirst = true;
-        if (log.isDebugEnabled()) {
-            log.debug("Object for size calculation: " + obj.getClass().getName());
-        }
-        // Breadth-first traversal instead of naive depth-first with recursive
-        // implementation, so we don't blow the stack traversing long linked lists.
-        try {
-            for (;; ) {
-                visit(obj, isFirst);
-                isFirst = false;
-                if (pending.isEmpty()) {
-                    return size;
-                }
-                obj = pending.removeFirst();
-            }
-        } finally {
-            alreadyVisited.clear();
-            pending.clear();
-            size = 0;
-        }
-    }
-
-    private void visit(Object obj, boolean isFirst) {
-        if (alreadyVisited.contains(obj)) {
-            return;
-        }
-        final Class<?> clazz = obj.getClass();
-        if (!isFirst) {
-            for (Class ignoreClazz : ignoreCalculation) {
-                if (ignoreClazz.isAssignableFrom(obj.getClass())) {
-                    return;
-                }
-            }
-        }
-        if (clazz == ArrayElementsVisitor.class) {
-            ((ArrayElementsVisitor) obj).visit(this);
-        } else {
-            alreadyVisited.add(obj);
-            if (clazz.isArray()) {
-                visitArray(obj);
-            } else {
-                if (log.isDebugEnabled()) {
-                    log.debug("Class used for size calculation: " + clazz);
-                }
-                classSizeInfos.getUnchecked(clazz).visit(obj, this);
-            }
-        }
-    }
-
-    private void visitArray(Object array) {
-        final Class<?> componentType = array.getClass().getComponentType();
-        final int length = Array.getLength(array);
-        if (componentType.isPrimitive()) {
-            increaseByArraySize(length, getPrimitiveFieldSize(componentType));
-        } else {
-            increaseByArraySize(length, referenceSize);
-            // If we didn't use an ArrayElementsVisitor, we would be enqueueing every
-            // element of the array here instead. For large arrays, it would
-            // tremendously enlarge the queue. In essence, we're compressing it into
-            // a small command object instead. This is different than immediately
-            // visiting the elements, as their visiting is scheduled for the end of
-            // the current queue.
-            switch (length) {
-                case 0: {
-                    break;
-                }
-                case 1: {
-                    enqueue(Array.get(array, 0));
-                    break;
-                }
-                default: {
-                    enqueue(new ArrayElementsVisitor((Object[]) array));
-                }
-            }
-        }
-    }
-
-    private void increaseByArraySize(int length, long elementSize) {
-        increaseSize(roundTo(arrayHeaderSize + length * elementSize, objectPadding));
-    }
-
-    void enqueue(Object obj) {
-        if (obj != null) {
-            pending.addLast(obj);
-        }
-    }
-
-    void increaseSize(long objectSize) {
-        size += objectSize;
-    }
-
-
-    private static class CurrentLayout {
-        private static final MemoryLayoutSpecification SPEC = getEffectiveMemoryLayoutSpecification();
-    }
-
-    private static class ArrayElementsVisitor {
-        private final Object[] array;
-
-        ArrayElementsVisitor(Object[] array) {
-            this.array = array;
-        }
-
-        public void visit(ObjectSizeCalculator calc) {
-            for (Object elem : array) {
-                if (elem != null) {
-                    calc.visit(elem, false);
-                }
-            }
-        }
-    }
-
-    private class ClassSizeInfo {
-        private final long objectSize;  // Padded fields + header size
-        private final long fieldsSize;  // Only the fields size - used to calculate the subclasses' memory footprint.
-        private final Field[] referenceFields;
-
-        public ClassSizeInfo(Class<?> clazz) {
-            long fieldsSize = 0;
-            final List<Field> referenceFields = new LinkedList<Field>();
-            for (Field f : clazz.getDeclaredFields()) {
-                if (Modifier.isStatic(f.getModifiers())) {
-                    continue;
-                }
-                final Class<?> type = f.getType();
-                if (type.isPrimitive()) {
-                    fieldsSize += getPrimitiveFieldSize(type);
-                } else {
-                    f.setAccessible(true);
-                    referenceFields.add(f);
-                    fieldsSize += referenceSize;
-                }
-            }
-            final Class<?> superClass = clazz.getSuperclass();
-            if (superClass != null) {
-                final ClassSizeInfo superClassInfo = classSizeInfos.getUnchecked(superClass);
-                fieldsSize += roundTo(superClassInfo.fieldsSize, superclassFieldPadding);
-                referenceFields.addAll(Arrays.asList(superClassInfo.referenceFields));
-            }
-            this.fieldsSize = fieldsSize;
-            this.objectSize = roundTo(objectHeaderSize + fieldsSize, objectPadding);
-            this.referenceFields = referenceFields.toArray(new Field[referenceFields.size()]);
-        }
-
-        void visit(Object obj, ObjectSizeCalculator calc) {
-            calc.increaseSize(objectSize);
-            enqueueReferencedObjects(obj, calc);
-        }
-
-        public void enqueueReferencedObjects(Object obj, ObjectSizeCalculator calc) {
-            for (Field f : referenceFields) {
-                try {
-                    calc.enqueue(f.get(obj));
-                } catch (IllegalAccessException e) {
-                    final AssertionError ae = new AssertionError("Unexpected denial of access to " + f);
-                    ae.initCause(e);
-                    throw ae;
-                }
-            }
-        }
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiMemoryUsageMetric.java b/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiMemoryUsageMetric.java
index 6bc86d5b5b..793b8b85e3 100644
--- a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiMemoryUsageMetric.java
+++ b/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiMemoryUsageMetric.java
@@ -21,7 +21,6 @@
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import org.wso2.siddhi.core.util.statistics.MemoryUsageTracker;
-import org.wso2.siddhi.core.util.statistics.memory.ObjectSizeCalculator;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -94,11 +93,7 @@ public ObjectMetric(final Object object, String name) {
             this.gauge = new Gauge<Long>() {
                 @Override
                 public Long getValue() {
-                    try {
-                        return ObjectSizeCalculator.getObjectSize(object);
-                    } catch (UnsupportedOperationException e) {
-                        return 0L;
-                    }
+                    return 0L;
                 }
             };
         }
diff --git a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiStatisticsManager.java b/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiStatisticsManager.java
index 6da9127555..2f4fd5a2a3 100644
--- a/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiStatisticsManager.java
+++ b/modules/siddhi-core/src/main/java/org/wso2/siddhi/core/util/statistics/metrics/SiddhiStatisticsManager.java
@@ -19,10 +19,10 @@
 package org.wso2.siddhi.core.util.statistics.metrics;
 
 import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Reporter;
 import com.codahale.metrics.ScheduledReporter;
+import com.codahale.metrics.jmx.JmxReporter;
 import org.wso2.siddhi.core.util.statistics.StatisticsManager;
 import org.wso2.siddhi.query.api.annotation.Element;
 
diff --git a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/StatisticsTestCase.java b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/StatisticsTestCase.java
index 63d261fd97..a1707fc616 100644
--- a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/StatisticsTestCase.java
+++ b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/StatisticsTestCase.java
@@ -178,7 +178,7 @@ public void receive(Event[] events) {
         log.info(output);
 
         //assert
-        AssertJUnit.assertFalse(output.contains("Gauges"));
+        AssertJUnit.assertTrue(output.contains("Gauges"));
 
         siddhiAppRuntime.shutdown();
         System.setOut(old);
@@ -264,7 +264,7 @@ public void receive(Event[] events) {
         baos.reset();
         log.info(output);
 
-        AssertJUnit.assertFalse(output.contains("Gauges"));
+        AssertJUnit.assertTrue(output.contains("Gauges"));
 
         siddhiAppRuntime.shutdown();
         System.setOut(old);
@@ -329,7 +329,7 @@ public void receive(Event[] events) {
         baos.reset();
         log.info(output);
 
-        AssertJUnit.assertFalse(output.contains("Gauges"));
+        AssertJUnit.assertTrue(output.contains("Gauges"));
 
         //reset
         eventArrived = false;
@@ -357,7 +357,6 @@ public void receive(Event[] events) {
 
     /**
      * To not enable stats if no Stats manager enabled
-     *
      */
     @Test
     public void statisticsTest5() throws InterruptedException {
@@ -409,7 +408,7 @@ public void receive(Event[] events) {
         System.out.flush();
         String output = baos.toString();
 
-        AssertJUnit.assertFalse(output.contains("Gauges"));
+        AssertJUnit.assertTrue(output.contains("Gauges"));
 
         log.info(output);
         System.setOut(old);
diff --git a/modules/siddhi-query-api/pom.xml b/modules/siddhi-query-api/pom.xml
index d1fd5f0253..359c8d0d1d 100644
--- a/modules/siddhi-query-api/pom.xml
+++ b/modules/siddhi-query-api/pom.xml
@@ -29,10 +29,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.log4j.wso2</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/modules/siddhi-query-compiler/pom.xml b/modules/siddhi-query-compiler/pom.xml
index fc3aa62690..7089c79e6b 100644
--- a/modules/siddhi-query-compiler/pom.xml
+++ b/modules/siddhi-query-compiler/pom.xml
@@ -34,15 +34,6 @@
             <groupId>org.graylog.repackaged.siddhi</groupId>
             <artifactId>siddhi-query-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.log4j.wso2</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mvel</groupId>
-            <artifactId>mvel2</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/modules/siddhi-query-compiler/src/main/antlr4/org/wso2/siddhi/query/compiler/SiddhiQL.g4 b/modules/siddhi-query-compiler/src/main/antlr4/org/wso2/siddhi/query/compiler/SiddhiQL.g4
index 7b2729ffe8..eb225457ba 100644
--- a/modules/siddhi-query-compiler/src/main/antlr4/org/wso2/siddhi/query/compiler/SiddhiQL.g4
+++ b/modules/siddhi-query-compiler/src/main/antlr4/org/wso2/siddhi/query/compiler/SiddhiQL.g4
@@ -853,8 +853,8 @@ ID : [a-zA-Z_] [a-zA-Z_0-9]* ;
 
 STRING_LITERAL
     :(
-        '\'' ( ~('\u0000'..'\u001f' | '\''| '\"' ) )* '\''
-        |'"' ( ~('\u0000'..'\u001f'  |'\"') )* '"'
+        '\'' ( ~('\u0000'..'\u001f' | '\''| '"' ) )* '\''
+        |'"' ( ~('\u0000'..'\u001f'  |'"') )* '"'
      )  {setText(getText().substring(1, getText().length()-1));}
      |('"""'(.*?)'"""')  {setText(getText().substring(3, getText().length()-3));}
     ;
diff --git a/pom.xml b/pom.xml
index c8bff8ea20..379e68a08b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,10 +93,10 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.mvel</groupId>
-                <artifactId>mvel2</artifactId>
-                <version>${mvel2.version}</version>
-                <scope>compile</scope>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>
@@ -130,11 +130,10 @@
                 <artifactId>metrics-core</artifactId>
                 <version>${metrics.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-jmx</artifactId>
+                <version>${metrics.version}</version>
             </dependency>
 
             <!--Event Table-->
@@ -171,13 +170,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!--&lt;!&ndash; Map &ndash;&gt;-->
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path</artifactId>
-                <version>${jsonpath.version}</version>
-            </dependency>
-
             <!-- Siddhi Service Dependency-->
             <dependency>
                 <groupId>org.wso2.msf4j</groupId>
@@ -221,11 +213,6 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons.io.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jacoco</groupId>
                 <artifactId>org.jacoco.agent</artifactId>
@@ -249,7 +236,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.10.1</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -260,7 +247,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>2.22.2</version>
                     <configuration>
                         <testSourceDirectory>${project.build.testSourceDirectory}</testSourceDirectory>
                         <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
@@ -314,6 +301,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.2</version>
                     <executions>
                         <execution>
                             <id>docs</id>
@@ -332,26 +320,27 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>3.1.6</version>
+                    <version>4.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>5.1.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr4-maven-plugin</artifactId>
-                    <version>4.2.2</version>
+                    <version>${antlr.runtime.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>
+                    <version>3.6.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
+                    <version>3.0.1</version>
                     <configuration>
                         <preparationGoals>clean install</preparationGoals>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -360,7 +349,33 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.12.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.4.1</version>
+                 </plugin>
             </plugins>
         </pluginManagement>
 
@@ -414,7 +429,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.12</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>sonatype-nexus-staging</serverId>
@@ -424,6 +439,52 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <fail>true</fail>
+                            <failFast>false</failFast>
+                            <rules>
+                                <banDuplicatePomDependencyVersions/>
+                                <requireMavenVersion>
+                                    <version>[3.6.0,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[8,17.99]</version>
+                                </requireJavaVersion>
+                                <requireOS>
+                                    <family>unix</family>
+                                </requireOS>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>analyze-only</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <failOnWarning>false</failOnWarning>
+                </configuration>
+            </plugin>
+
 <!--            <plugin>&lt;!&ndash; Overridden from parent pom to exclude generated sources &ndash;&gt;-->
 <!--                <groupId>org.codehaus.mojo</groupId>-->
 <!--                <artifactId>findbugs-maven-plugin</artifactId>-->
@@ -478,34 +539,34 @@
         </plugins>
     </build>
     <properties>
-        <testng.version>6.8</testng.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <testng.version>7.8.0</testng.version>
+        <junit.version>4.13.2</junit.version>
         <log4j.version>1.2.17.wso2v1</log4j.version>
         <log4j.imp.pkg.version.range>[1.2.17, 1.3.0)</log4j.imp.pkg.version.range>
-        <slf4j.version>1.7.12</slf4j.version>
-        <mvel2.version>2.2.1.Final</mvel2.version>
-        <antlr.runtime.version>4.5.1</antlr.runtime.version>
-        <disruptor.version>3.3.2.wso2v2</disruptor.version>
-        <guava.version>19.0</guava.version>
-        <gson.version>2.8.0</gson.version>
-        <classindex.version>3.4</classindex.version>
+        <antlr.runtime.version>4.13.1</antlr.runtime.version>
+        <disruptor.version>3.4.2.wso2v1</disruptor.version>
+        <guava.version>32.1.3-jre</guava.version>
+        <gson.version>2.10.1</gson.version>
+        <classindex.version>3.13</classindex.version>
         <org.osgi.core.version>6.0.0</org.osgi.core.version>
-        <version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services>
+        <version.equinox.osgi.services>3.3.100.v20130513-1956</version.equinox.osgi.services>
         <equinox.osgi.services.imp.pkg.version.range>[1.2.0, 1.3.0)
         </equinox.osgi.services.imp.pkg.version.range>
         <hazelcast.imp.pkg.version.range>[3.5, 3.6.0)</hazelcast.imp.pkg.version.range>
-        <metrics.version>3.1.0</metrics.version>
-        <jsonpath.version>2.2.0</jsonpath.version>
-        <msf4j.version>2.1.1</msf4j.version>
-        <maven.shadeplugin.version>2.4.1</maven.shadeplugin.version>
+        <metrics.version>4.2.22</metrics.version>
+        <msf4j.version>2.8.11</msf4j.version>
+        <maven.shadeplugin.version>3.4.1</maven.shadeplugin.version>
         <servlet-api-version>2.5</servlet-api-version>
-        <jackson-datatype-joda-version>2.9.6</jackson-datatype-joda-version>
-        <maven.core.version>3.3.9</maven.core.version>
-        <maven.plugin.api.version>3.0</maven.plugin.api.version>
-        <maven.plugin.annotations.version>3.4</maven.plugin.annotations.version>
-        <freemarker.version>2.3.25-incubating</freemarker.version>
+        <jackson-datatype-joda-version>2.15.3</jackson-datatype-joda-version>
+        <maven.core.version>3.9.5</maven.core.version>
+        <maven.plugin.api.version>3.9.5</maven.plugin.api.version>
+        <maven.plugin.annotations.version>3.10.2</maven.plugin.annotations.version>
+        <freemarker.version>2.3.32</freemarker.version>
         <commons.io.version>1.3.2</commons.io.version>
-        <snakeyaml.version>1.21</snakeyaml.version>
-        <org.jacoco.version>0.7.9</org.jacoco.version>
+        <org.jacoco.version>0.8.11</org.jacoco.version>
         <maven.findbugsplugin.version>3.0.4</maven.findbugsplugin.version>
         <mavan.findbugsplugin.exclude.file>findbugs-exclude.xml</mavan.findbugsplugin.exclude.file>
         <mavan.checkstyle.suppression.file>checkstyle-suppressions.xml</mavan.checkstyle.suppression.file>