From 6a716468c47381711b853d2a148d1f1270e0abda Mon Sep 17 00:00:00 2001 From: dnwick Date: Thu, 27 Jan 2022 15:50:46 +0530 Subject: [PATCH] Upgrade log4j1 to 2.17.1 --- component/pom.xml | 4 +- .../extension/io/cdc/source/CDCSource.java | 5 +- .../listening/MongoChangeDataCapture.java | 5 +- .../listening/RdbmsChangeDataCapture.java | 5 +- .../cdc/source/metrics/ListeningMetrics.java | 5 +- .../io/cdc/source/metrics/PollingMetrics.java | 5 +- .../cdc/source/polling/CDCCronExecutor.java | 5 +- .../io/cdc/source/polling/CDCPoller.java | 5 +- .../strategies/DefaultPollingStrategy.java | 5 +- .../polling/strategies/PollingStrategy.java | 5 +- .../WaitOnMissingRecordPollingStrategy.java | 5 +- .../extension/io/cdc/util/CDCPollingUtil.java | 5 +- component/src/main/resources/log4j.properties | 31 -------- .../src/main/resources/log4j2.properties | 40 ++++++++++ .../source/TestCaseOfCDCListeningMode.java | 5 +- .../TestCaseOfCDCListeningModeMongo.java | 5 +- .../cdc/source/TestCaseOfCDCPollingMode.java | 5 +- .../source/TestCaseOfCDCSourceValidation.java | 5 +- component/src/test/resources/log4j.properties | 31 -------- .../src/test/resources/log4j2.properties | 40 ++++++++++ pom.xml | 74 +++++++++++++++++-- 21 files changed, 194 insertions(+), 101 deletions(-) delete mode 100644 component/src/main/resources/log4j.properties create mode 100755 component/src/main/resources/log4j2.properties delete mode 100644 component/src/test/resources/log4j.properties create mode 100755 component/src/test/resources/log4j2.properties diff --git a/component/pom.xml b/component/pom.xml index 0dec84b..c08bfda 100644 --- a/component/pom.xml +++ b/component/pom.xml @@ -33,8 +33,8 @@ ${json.version} - org.apache.log4j.wso2 - log4j + org.apache.logging.log4j + log4j-core io.debezium diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/CDCSource.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/CDCSource.java index a1edf51..6aff2bb 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/CDCSource.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/CDCSource.java @@ -48,7 +48,8 @@ import io.siddhi.extension.io.cdc.util.CDCSourceConstants; import io.siddhi.extension.io.cdc.util.CDCSourceUtil; import io.siddhi.query.api.exception.SiddhiAppValidationException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.JobKey; import org.quartz.Scheduler; import org.quartz.SchedulerException; @@ -429,7 +430,7 @@ } ) public class CDCSource extends Source { - private static final Logger log = Logger.getLogger(CDCSource.class); + private static final Logger log = LogManager.getLogger(CDCSource.class); private final ExecutorService executorService = Executors.newSingleThreadExecutor(); private int pollingInterval; private String mode; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/MongoChangeDataCapture.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/MongoChangeDataCapture.java index 3b85c34..6a926e3 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/MongoChangeDataCapture.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/MongoChangeDataCapture.java @@ -24,7 +24,8 @@ import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.errors.DataException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; @@ -38,7 +39,7 @@ * This class is for capturing change data for MongoDB using debezium embedded engine. **/ public class MongoChangeDataCapture extends ChangeDataCapture { - private static final Logger log = Logger.getLogger(MongoChangeDataCapture.class); + private static final Logger log = LogManager.getLogger(MongoChangeDataCapture.class); public MongoChangeDataCapture(String operation, SourceEventListener sourceEventListener, ListeningMetrics metrics) { super(operation, sourceEventListener, metrics); diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/RdbmsChangeDataCapture.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/RdbmsChangeDataCapture.java index 6585354..4ef95f7 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/RdbmsChangeDataCapture.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/listening/RdbmsChangeDataCapture.java @@ -26,7 +26,8 @@ import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.errors.DataException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.math.BigDecimal; import java.util.ArrayList; @@ -39,7 +40,7 @@ * This class is for capturing change data for RDBMS using debezium embedded engine. **/ public class RdbmsChangeDataCapture extends ChangeDataCapture { - private static final Logger log = Logger.getLogger(RdbmsChangeDataCapture.class); + private static final Logger log = LogManager.getLogger(RdbmsChangeDataCapture.class); public RdbmsChangeDataCapture(String operation, SourceEventListener sourceEventListener, ListeningMetrics metrics) { super(operation, sourceEventListener, metrics); diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/ListeningMetrics.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/ListeningMetrics.java index 9c9ecff..b75a8e9 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/ListeningMetrics.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/ListeningMetrics.java @@ -18,7 +18,8 @@ package io.siddhi.extension.io.cdc.source.metrics; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.wso2.carbon.metrics.core.Counter; import org.wso2.carbon.metrics.core.Level; import org.wso2.carbon.si.metrics.core.internal.MetricsDataHolder; @@ -31,7 +32,7 @@ */ public class ListeningMetrics extends Metrics { - private static final Logger log = Logger.getLogger(ListeningMetrics.class); + private static final Logger log = LogManager.getLogger(ListeningMetrics.class); private final String operationType; private boolean isLastReceivedTimeMetricsRegistered; private long lastReceivedTime; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/PollingMetrics.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/PollingMetrics.java index b0b8292..7c00502 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/PollingMetrics.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/metrics/PollingMetrics.java @@ -18,7 +18,8 @@ package io.siddhi.extension.io.cdc.source.metrics; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.wso2.carbon.metrics.core.Counter; import org.wso2.carbon.metrics.core.Level; import org.wso2.carbon.si.metrics.core.internal.MetricsDataHolder; @@ -32,7 +33,7 @@ */ public class PollingMetrics extends Metrics { - private static final Logger log = Logger.getLogger(PollingMetrics.class); + private static final Logger log = LogManager.getLogger(PollingMetrics.class); private final Queue pollingDetails = new LinkedList<>(); private int receiveEventsPerPollingInterval; private int pollingHistorySize; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCCronExecutor.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCCronExecutor.java index af5e1eb..2ab8cce 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCCronExecutor.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCCronExecutor.java @@ -21,7 +21,8 @@ import io.siddhi.extension.io.cdc.source.config.CronConfiguration; import io.siddhi.extension.io.cdc.source.polling.strategies.PollingStrategy; import io.siddhi.extension.io.cdc.util.CDCSourceConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.CronScheduleBuilder; import org.quartz.Job; import org.quartz.JobBuilder; @@ -41,7 +42,7 @@ * expression then it will print the inserts and updates happened after App get started. */ public class CDCCronExecutor implements Job { - private static final Logger log = Logger.getLogger(CDCCronExecutor.class); + private static final Logger log = LogManager.getLogger(CDCCronExecutor.class); public CDCCronExecutor() { } diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCPoller.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCPoller.java index 7a8e394..82a335e 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCPoller.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/CDCPoller.java @@ -29,7 +29,8 @@ import io.siddhi.extension.io.cdc.source.polling.strategies.WaitOnMissingRecordPollingStrategy; import io.siddhi.extension.io.cdc.util.CDCPollingUtil; import io.siddhi.extension.io.cdc.util.CDCSourceConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; @@ -48,7 +49,7 @@ */ public class CDCPoller implements Runnable { - private static final Logger log = Logger.getLogger(CDCPoller.class); + private static final Logger log = LogManager.getLogger(CDCPoller.class); private String url; private String tableName; private String username; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/DefaultPollingStrategy.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/DefaultPollingStrategy.java index e1c9802..9e38a5a 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/DefaultPollingStrategy.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/DefaultPollingStrategy.java @@ -26,7 +26,8 @@ import io.siddhi.extension.io.cdc.source.metrics.PollingMetrics; import io.siddhi.extension.io.cdc.source.polling.CDCPollingModeException; import io.siddhi.extension.io.cdc.util.CDCPollingUtil; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +43,7 @@ * on. */ public class DefaultPollingStrategy extends PollingStrategy { - private static final Logger log = Logger.getLogger(DefaultPollingStrategy.class); + private static final Logger log = LogManager.getLogger(DefaultPollingStrategy.class); private String pollingColumn; private int pollingInterval; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/PollingStrategy.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/PollingStrategy.java index 064925a..ad41185 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/PollingStrategy.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/PollingStrategy.java @@ -31,7 +31,8 @@ import io.siddhi.extension.io.cdc.util.CDCPollingUtil; import io.siddhi.extension.io.cdc.util.CDCSourceConstants; import io.siddhi.extension.io.cdc.util.MyYamlConstructor; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; @@ -48,7 +49,7 @@ * Abstract definition of polling strategy to poll DB changes. */ public abstract class PollingStrategy { - private static final Logger log = Logger.getLogger(PollingStrategy.class); + private static final Logger log = LogManager.getLogger(PollingStrategy.class); private static final String PLACE_HOLDER_TABLE_NAME = "{{TABLE_NAME}}"; private static final String PLACE_HOLDER_COLUMN_LIST = "{{COLUMN_LIST}}"; private static final String PLACE_HOLDER_CONDITION = "{{CONDITION}}"; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/WaitOnMissingRecordPollingStrategy.java b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/WaitOnMissingRecordPollingStrategy.java index 4565173..d3e3cc1 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/WaitOnMissingRecordPollingStrategy.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/source/polling/strategies/WaitOnMissingRecordPollingStrategy.java @@ -25,7 +25,8 @@ import io.siddhi.extension.io.cdc.source.metrics.PollingMetrics; import io.siddhi.extension.io.cdc.source.polling.CDCPollingModeException; import io.siddhi.extension.io.cdc.util.CDCPollingUtil; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +43,7 @@ * {@code pollingInterval}, {@code missedRecordRetryIntervalMS} and {@code missedRecordWaitingTimeoutMS}. */ public class WaitOnMissingRecordPollingStrategy extends PollingStrategy { - private static final Logger log = Logger.getLogger(WaitOnMissingRecordPollingStrategy.class); + private static final Logger log = LogManager.getLogger(WaitOnMissingRecordPollingStrategy.class); private String pollingColumn; private int pollingInterval; diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCPollingUtil.java b/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCPollingUtil.java index 2f022ea..680e9b2 100644 --- a/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCPollingUtil.java +++ b/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCPollingUtil.java @@ -19,7 +19,8 @@ package io.siddhi.extension.io.cdc.util; import io.siddhi.extension.io.cdc.source.polling.CDCPollingModeException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.sql.Connection; import java.sql.ResultSet; @@ -32,7 +33,7 @@ * This class contains Util methods for the CDCPoller. */ public class CDCPollingUtil { - private static final Logger log = Logger.getLogger(CDCPollingUtil.class); + private static final Logger log = LogManager.getLogger(CDCPollingUtil.class); /** * Utility method which can be used to check if a given string instance is null or empty. diff --git a/component/src/main/resources/log4j.properties b/component/src/main/resources/log4j.properties deleted file mode 100644 index aa309f1..0000000 --- a/component/src/main/resources/log4j.properties +++ /dev/null @@ -1,31 +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. -# -# 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=[%t] %-5p %c %x - %m%n -log4j.logger.io.debezium=ERROR -log4j.logger.com.github.shyiko=ERROR diff --git a/component/src/main/resources/log4j2.properties b/component/src/main/resources/log4j2.properties new file mode 100755 index 0000000..2ce5010 --- /dev/null +++ b/component/src/main/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/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningMode.java b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningMode.java index c090e08..a4e9d2c 100644 --- a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningMode.java +++ b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningMode.java @@ -25,7 +25,8 @@ import io.siddhi.core.stream.input.InputHandler; import io.siddhi.core.stream.output.StreamCallback; 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.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class TestCaseOfCDCListeningMode { - private static final Logger log = Logger.getLogger(TestCaseOfCDCListeningMode.class); + private static final Logger log = LogManager.getLogger(TestCaseOfCDCListeningMode.class); private Event currentEvent; private AtomicInteger eventCount = new AtomicInteger(0); private AtomicBoolean eventArrived = new AtomicBoolean(false); diff --git a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningModeMongo.java b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningModeMongo.java index 408911f..d74714c 100644 --- a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningModeMongo.java +++ b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCListeningModeMongo.java @@ -25,7 +25,8 @@ import io.siddhi.core.stream.input.InputHandler; import io.siddhi.core.stream.output.StreamCallback; 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.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -36,7 +37,7 @@ public class TestCaseOfCDCListeningModeMongo { - private static final Logger log = Logger.getLogger(TestCaseOfCDCListeningModeMongo.class); + private static final Logger log = LogManager.getLogger(TestCaseOfCDCListeningModeMongo.class); private Event currentEvent; private AtomicInteger eventCount = new AtomicInteger(0); private AtomicBoolean eventArrived = new AtomicBoolean(false); diff --git a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCPollingMode.java b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCPollingMode.java index 5a98e3b..602be83 100644 --- a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCPollingMode.java +++ b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCPollingMode.java @@ -29,7 +29,8 @@ import io.siddhi.core.util.SiddhiTestHelper; import io.siddhi.core.util.persistence.InMemoryPersistenceStore; import io.siddhi.core.util.persistence.PersistenceStore; -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.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -40,7 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class TestCaseOfCDCPollingMode { - private static final Logger log = Logger.getLogger(TestCaseOfCDCPollingMode.class); + private static final Logger log = LogManager.getLogger(TestCaseOfCDCPollingMode.class); private Event currentEvent; private AtomicInteger eventCount = new AtomicInteger(0); private AtomicBoolean eventArrived = new AtomicBoolean(false); diff --git a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java index a0ad6d8..651f44b 100644 --- a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java +++ b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java @@ -25,7 +25,8 @@ import io.siddhi.core.query.output.callback.QueryCallback; import io.siddhi.core.util.SiddhiTestHelper; import io.siddhi.query.api.exception.SiddhiAppValidationException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,7 @@ public class TestCaseOfCDCSourceValidation { - private static final Logger log = Logger.getLogger(TestCaseOfCDCSourceValidation.class); + private static final Logger log = LogManager.getLogger(TestCaseOfCDCSourceValidation.class); private AtomicInteger eventCount = new AtomicInteger(0); private AtomicBoolean eventArrived = new AtomicBoolean(false); private int waitTime = 50; diff --git a/component/src/test/resources/log4j.properties b/component/src/test/resources/log4j.properties deleted file mode 100644 index aa309f1..0000000 --- a/component/src/test/resources/log4j.properties +++ /dev/null @@ -1,31 +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. -# -# 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=[%t] %-5p %c %x - %m%n -log4j.logger.io.debezium=ERROR -log4j.logger.com.github.shyiko=ERROR 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 c2d7e9c..6050d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -57,31 +57,67 @@ io.debezium debezium-embedded ${debezium-embedded.version} + + + log4j + log4j + + io.debezium debezium-connector-mysql ${debezium-connector-mysql.version} + + + log4j + log4j + + io.debezium debezium-connector-oracle ${debezium-connector-oracle.version} + + + log4j + log4j + + io.debezium debezium-connector-postgres ${debezium-connector-postgres.version} + + + log4j + log4j + + io.debezium debezium-connector-sqlserver ${debezium-connector-sqlserver.version} + + + log4j + log4j + + io.debezium debezium-connector-mongodb ${debezium-connector-mongodb.version} + + + log4j + log4j + + com.zaxxer @@ -147,8 +183,8 @@ test - org.apache.log4j.wso2 - log4j + org.apache.logging.log4j + log4j-core ${log4j.version} @@ -181,16 +217,34 @@ org.apache.kafka connect-json ${kafka.connect.version} + + + log4j + log4j + + org.apache.kafka connect-runtime ${kafka.connect.version} + + + log4j + log4j + + org.apache.kafka connect-api ${kafka.connect.version} + + + log4j + log4j + + org.yaml @@ -201,6 +255,12 @@ org.wso2.carbon.analytics org.wso2.carbon.si.metrics.core ${carbon.analytics.version} + + + log4j + log4j + + @@ -238,11 +298,11 @@ - 5.1.13 + 5.1.21-SNAPSHOT [5.1.0,6.0.0) - 1.2.17.wso2v1 + 2.17.1 4.4.15 - 2.0.7 + 2.1.2-SNAPSHOT 0.7.9 0.13.0 1.4.0.Final @@ -254,7 +314,7 @@ 12.1.0.2 3.2.0 6.11 - 7.0.7 + 7.0.13-SNAPSHOT 2.1.1 RELEASE ../findbugs-exclude.xml @@ -274,7 +334,7 @@ 2.3.0 3.4.0 20190722 - 3.0.37 + 3.0.57-SNAPSHOT [1.2.0,2.0.0) [1.0.0,4.0.0) 1.23