diff --git a/component/pom.xml b/component/pom.xml
index c6f4f55..1c39121 100644
--- a/component/pom.xml
+++ b/component/pom.xml
@@ -41,8 +41,8 @@
siddhi-query-api
- org.apache.log4j.wso2
- log4j
+ org.apache.logging.log4j
+ log4j-core
commons-logging
diff --git a/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/CassandraEventTable.java b/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/CassandraEventTable.java
index a05fa4b..91a8560 100644
--- a/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/CassandraEventTable.java
+++ b/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/CassandraEventTable.java
@@ -44,7 +44,8 @@
import io.siddhi.query.api.definition.Attribute;
import io.siddhi.query.api.definition.TableDefinition;
import io.siddhi.query.api.util.AnnotationHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.wso2.extension.siddhi.store.cassandra.condition.CassandraCompiledCondition;
import org.wso2.extension.siddhi.store.cassandra.condition.CassandraConditionVisitor;
import org.wso2.extension.siddhi.store.cassandra.config.CassandraStoreConfig;
@@ -198,7 +199,7 @@ public class CassandraEventTable extends AbstractRecordTable {
private List indexes;
private int port;
- private static final Logger LOG = Logger.getLogger(CassandraEventTable.class);
+ private static final Logger LOG = LogManager.getLogger(CassandraEventTable.class);
@Override
protected void init(TableDefinition tableDefinition, ConfigReader configReader) {
diff --git a/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/condition/CassandraCompiledCondition.java b/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/condition/CassandraCompiledCondition.java
index c21397b..add0c52 100644
--- a/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/condition/CassandraCompiledCondition.java
+++ b/component/src/main/java/org/wso2/extension/siddhi/store/cassandra/condition/CassandraCompiledCondition.java
@@ -28,6 +28,7 @@
* states to be used at runtime.
*/
public class CassandraCompiledCondition implements CompiledCondition {
+ private static final long serialVersionUID = 1L;
private String compiledQuery;
private SortedMap parameters;
private boolean readOnlyCondition;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ContainsInCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ContainsInCassandraTableTestCase.java
index 9221ffb..ea846b3 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ContainsInCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ContainsInCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -43,7 +44,7 @@
public class ContainsInCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(ContainsInCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(ContainsInCassandraTableTestCase.class);
private int removeEventCount;
private boolean eventArrived;
private AtomicInteger inEventCount;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/DefineCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/DefineCassandraTableTestCase.java
index faa43f9..ee687f5 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/DefineCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/DefineCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -42,7 +43,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class DefineCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(DefineCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(DefineCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/InsertIntoCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/InsertIntoCassandraTableTestCase.java
index 6b791b2..5f23e36 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/InsertIntoCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/InsertIntoCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -43,7 +44,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class InsertIntoCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(InsertIntoCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(InsertIntoCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/JoinCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/JoinCassandraTableTestCase.java
index cc0c830..ef35915 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/JoinCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/JoinCassandraTableTestCase.java
@@ -25,7 +25,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -47,7 +48,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class JoinCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(JoinCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(JoinCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ReadFromCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ReadFromCassandraTableTestCase.java
index 86a04d6..aad072e 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ReadFromCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/ReadFromCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -42,7 +43,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class ReadFromCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(ReadFromCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(ReadFromCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateCassandraTableTestCase.java
index ee242a2..6809047 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -42,7 +43,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class UpdateCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(UpdateCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(UpdateCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateOrInsertIntoCassandraTableTestCase.java b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateOrInsertIntoCassandraTableTestCase.java
index d2541c1..5e73d09 100644
--- a/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateOrInsertIntoCassandraTableTestCase.java
+++ b/component/src/test/java/org/wso2/extension/siddhi/store/cassandra/UpdateOrInsertIntoCassandraTableTestCase.java
@@ -24,7 +24,8 @@
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.core.util.EventPrinter;
import io.siddhi.core.util.SiddhiTestHelper;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -44,7 +45,7 @@
import static org.wso2.extension.siddhi.store.cassandra.utils.CassandraTableTestUtils.getPort;
public class UpdateOrInsertIntoCassandraTableTestCase {
- private static final Logger log = Logger.getLogger(UpdateOrInsertIntoCassandraTableTestCase.class);
+ private static final Logger log = LogManager.getLogger(UpdateOrInsertIntoCassandraTableTestCase.class);
private AtomicInteger inEventCount;
private int removeEventCount;
private boolean eventArrived;
diff --git a/component/src/test/resources/log4j.properties b/component/src/test/resources/log4j.properties
deleted file mode 100644
index 553a402..0000000
--- a/component/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2018, 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.
-#
-# For the general syntax of property based configuration files see the
-# documentation of org.apache.log4j.PropertyConfigurator.
-# The root category uses the appender called A1. Since no priority is
-# specified, the root category assumes the default priority for root
-# which is DEBUG in log4j. The root category is the only category that
-# has a default priority. All other categories need not be assigned a
-# priority in which case they inherit their priority from the
-# hierarchy.
-log4j.rootLogger=INFO, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%m%n
-log4j.logger.org.=WARN
-
diff --git a/component/src/test/resources/log4j2.properties b/component/src/test/resources/log4j2.properties
new file mode 100755
index 0000000..2ce5010
--- /dev/null
+++ b/component/src/test/resources/log4j2.properties
@@ -0,0 +1,40 @@
+#
+# /*
+# * Copyright (c) 2022, 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.
+# */
+#
+
+
+# For the general syntax of property based configuration files see the
+# documenation of org.apache.log4j.PropertyConfigurator.
+
+# The root category uses the appender called A1. Since no priority is
+# specified, the root category assumes the default priority for root
+# which is DEBUG in log4j. The root category is the only category that
+# has a default priority. All other categories need not be assigned a
+# priority in which case they inherit their priority from the
+# hierarchy.
+
+# Console appender configuration
+appender.console.type = Console
+appender.console.name = consoleLogger
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%t] %-5p %c %x - %m%n
+
+# Root logger referring to console appender
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = consoleLogger
diff --git a/pom.xml b/pom.xml
index 5660a3b..e6047f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
- 5.0.0
+ 5.1.21
[5.0.0,6.0.0)
- 1.2.17.wso2v1
+ 2.17.1
6.9.10
1.1.1
3.3.2
@@ -50,7 +50,7 @@
[4.0,5.0)
[4.0,5.0)
[4.0,5.0)
- [1.0,2.0)
+ [2.0,3.0)
UTF-8
UTF-8
@@ -77,8 +77,8 @@
${siddhi.version}
- org.apache.log4j.wso2
- log4j
+ org.apache.logging.log4j
+ log4j-core
${log4j.version}