Upgrade log4j1 to 2.17.1

component/pom.xml

@@ -41,8 +41,8 @@
             <artifactId>siddhi-query-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.log4j.wso2</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

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<String> 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) {

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<Integer, Object> parameters;
     private boolean readOnlyCondition;

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;

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;

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;

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;

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;

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;

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;

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

pom.xml

@@ -37,9 +37,9 @@
     </modules>
 
     <properties>
-        <siddhi.version>5.0.0</siddhi.version>
+        <siddhi.version>5.1.21</siddhi.version>
         <siddhi.version.range>[5.0.0,6.0.0)</siddhi.version.range>
-        <log4j.version>1.2.17.wso2v1</log4j.version>
+        <log4j.version>2.17.1</log4j.version>
         <testng.version>6.9.10</testng.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <commons.lang3.version>3.3.2</commons.lang3.version>
@@ -50,7 +50,7 @@
         <siddhi.annotation.version.range>[4.0,5.0)</siddhi.annotation.version.range>
         <siddhi.core.version.range>[4.0,5.0)</siddhi.core.version.range>
         <siddhi.query.version.range>[4.0,5.0)</siddhi.query.version.range>
-        <aparche.log4j.version.range>[1.0,2.0)</aparche.log4j.version.range>
+        <aparche.log4j.version.range>[2.0,3.0)</aparche.log4j.version.range>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -77,8 +77,8 @@
                 <version>${siddhi.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.log4j.wso2</groupId>
-                <artifactId>log4j</artifactId>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
                 <version>${log4j.version}</version>
                 <exclusions>
                     <exclusion>