From d39170061c6e0115b114e6ea19d1a0471956fe0d Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 13 Sep 2024 13:33:03 +0530 Subject: [PATCH 01/17] Change slf4j-jdk14 to log4j-slf4j-impl --- bvm/ballerina-core/build.gradle | 2 +- bvm/ballerina-rt/build.gradle | 2 +- gradle/javaProject.gradle | 2 +- langlib/langlib-test/build.gradle | 2 +- language-server/modules/langserver-core/build.gradle | 2 +- misc/docerina/build.gradle | 2 +- .../modules/ballerina-to-openapi-generator/build.gradle | 2 +- misc/testerina/modules/testerina-core/build.gradle | 2 +- observelib/observe/build.gradle | 2 +- stdlib/auth/build.gradle | 2 +- stdlib/bir-old/build.gradle | 2 +- stdlib/bir/build.gradle | 2 +- stdlib/cache/build.gradle | 2 +- stdlib/config-api/build.gradle | 2 +- stdlib/crypto/build.gradle | 2 +- stdlib/database/jdbc2/build.gradle | 2 +- stdlib/email/build.gradle | 2 +- stdlib/encoding/build.gradle | 2 +- stdlib/file/build.gradle | 2 +- stdlib/filepath/build.gradle | 2 +- stdlib/io/build.gradle | 2 +- stdlib/jdbc/build.gradle | 2 +- stdlib/jsonutils/build.gradle | 2 +- stdlib/math/build.gradle | 2 +- stdlib/runtime-api/build.gradle | 2 +- stdlib/socket/build.gradle | 2 +- stdlib/task/build.gradle | 2 +- stdlib/time/build.gradle | 2 +- stdlib/xmlutils/build.gradle | 2 +- tests/ballerina-compiler-plugin-test/build.gradle | 2 +- tests/ballerina-spec-conformance-tests/build.gradle | 2 +- tests/ballerina-test-utils/build.gradle | 2 +- tests/ballerina-tools-integration-test/build.gradle | 2 +- tests/jballerina-debugger-integration-test/build.gradle | 2 +- tests/jballerina-integration-test/build.gradle | 2 +- tests/jballerina-unit-test/build.gradle | 2 +- tests/openapi-integration-tests/build.gradle | 2 +- tests/testerina-integration-test/build.gradle | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/bvm/ballerina-core/build.gradle b/bvm/ballerina-core/build.gradle index 80f80aed02a4..dc192b91e88c 100644 --- a/bvm/ballerina-core/build.gradle +++ b/bvm/ballerina-core/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation 'io.opentracing:opentracing-util' implementation 'org.awaitility:awaitility' implementation 'com.zaxxer:HikariCP' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'commons-codec:commons-codec' } diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index d72f50951eea..b4976e731940 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -73,7 +73,7 @@ dependencies { // Third party jars // config - dist 'org.slf4j:slf4j-jdk14:1.7.22' + dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index ca7a6db1b043..0369850a5159 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -94,7 +94,7 @@ dependencies { implementation 'org.ow2.asm:asm-tree:7.1' implementation 'org.scala-lang:scala-library:2.11.7' implementation 'org.slf4j:slf4j-simple:1.7.26' - implementation 'org.slf4j:slf4j-jdk14:1.7.26' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' implementation 'org.testng:testng:6.14.3' implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' implementation 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' diff --git a/langlib/langlib-test/build.gradle b/langlib/langlib-test/build.gradle index 6a3eee163b08..fd6777897434 100644 --- a/langlib/langlib-test/build.gradle +++ b/langlib/langlib-test/build.gradle @@ -55,7 +55,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/language-server/modules/langserver-core/build.gradle b/language-server/modules/langserver-core/build.gradle index 21ec5aada46f..00fd95ee4e73 100644 --- a/language-server/modules/langserver-core/build.gradle +++ b/language-server/modules/langserver-core/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'io.netty:netty-buffer' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'com.google.code.findbugs:jsr305' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j' implementation 'com.h2database:h2' diff --git a/misc/docerina/build.gradle b/misc/docerina/build.gradle index 91835707cd3d..e2a7ddfea376 100644 --- a/misc/docerina/build.gradle +++ b/misc/docerina/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile 'org.testng:testng' testCompile project(':language-server:language-server-compiler') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } diff --git a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle index acaeebdd23ba..7a011a42cc83 100644 --- a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle +++ b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':language-server:language-server-compiler') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - OpenApi Tooling - Ballerina To OpenApi' diff --git a/misc/testerina/modules/testerina-core/build.gradle b/misc/testerina/modules/testerina-core/build.gradle index 1de0ad330dc5..848b22c60007 100644 --- a/misc/testerina/modules/testerina-core/build.gradle +++ b/misc/testerina/modules/testerina-core/build.gradle @@ -57,7 +57,7 @@ dependencies { interopImports project(':ballerina-io') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'io.swagger.core.v3:swagger-models' testCompile 'io.swagger.parser.v3:swagger-parser' testCompile 'com.github.jknack:handlebars' diff --git a/observelib/observe/build.gradle b/observelib/observe/build.gradle index c4030652361f..219ebd216a73 100644 --- a/observelib/observe/build.gradle +++ b/observelib/observe/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':metrics-extensions:ballerina-metrics-extension') implementation 'io.opentracing:opentracing-api' - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-runtime-api', configuration: 'baloImplementation') diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle index 5bd5816e109d..da576a6082ed 100644 --- a/stdlib/auth/build.gradle +++ b/stdlib/auth/build.gradle @@ -55,7 +55,7 @@ dependencies { interopImports project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-core') diff --git a/stdlib/bir-old/build.gradle b/stdlib/bir-old/build.gradle index c01c692468c0..9b7683237437 100644 --- a/stdlib/bir-old/build.gradle +++ b/stdlib/bir-old/build.gradle @@ -31,7 +31,7 @@ dependencies { balo project(path: ':ballerina-bootstrapper', configuration: 'pack1') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - BIR Model' diff --git a/stdlib/bir/build.gradle b/stdlib/bir/build.gradle index 95e48a668b50..a2e9cb792037 100644 --- a/stdlib/bir/build.gradle +++ b/stdlib/bir/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-core') testCompile 'io.netty:netty-transport' testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - BIR Model' diff --git a/stdlib/cache/build.gradle b/stdlib/cache/build.gradle index 3bb14faf3d98..c3248f61293a 100644 --- a/stdlib/cache/build.gradle +++ b/stdlib/cache/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-runtime') implementation project(':ballerina-java') implementation 'commons-logging:commons-logging' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/config-api/build.gradle b/stdlib/config-api/build.gradle index 60994cd5b414..daf42b62f231 100644 --- a/stdlib/config-api/build.gradle +++ b/stdlib/config-api/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-file') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' } diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle index f4b14543baa6..d4f4931c17a5 100644 --- a/stdlib/crypto/build.gradle +++ b/stdlib/crypto/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation project(':ballerina-java') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'commons-codec:commons-codec' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') diff --git a/stdlib/database/jdbc2/build.gradle b/stdlib/database/jdbc2/build.gradle index 1a1a4b5d3c3b..6cbe1fe8b479 100644 --- a/stdlib/database/jdbc2/build.gradle +++ b/stdlib/database/jdbc2/build.gradle @@ -55,7 +55,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' } diff --git a/stdlib/email/build.gradle b/stdlib/email/build.gradle index 31127d7fcd04..4d0d10ddc587 100644 --- a/stdlib/email/build.gradle +++ b/stdlib/email/build.gradle @@ -68,7 +68,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-io') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' testCompile 'com.icegreen:greenmail:1.5.11' } diff --git a/stdlib/encoding/build.gradle b/stdlib/encoding/build.gradle index 10636efba611..2a4e96c36da3 100644 --- a/stdlib/encoding/build.gradle +++ b/stdlib/encoding/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation project(':ballerina-runtime-api') implementation project(':ballerina-java') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(':ballerina-test-utils') diff --git a/stdlib/file/build.gradle b/stdlib/file/build.gradle index b67a4c5359ab..5b8e2d063a26 100644 --- a/stdlib/file/build.gradle +++ b/stdlib/file/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' } createBalo { diff --git a/stdlib/filepath/build.gradle b/stdlib/filepath/build.gradle index d774e52615eb..b0d3f10016a0 100644 --- a/stdlib/filepath/build.gradle +++ b/stdlib/filepath/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile project(':ballerina-file') - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/io/build.gradle b/stdlib/io/build.gradle index 59764ce8f1b2..2ffdea93aaaf 100644 --- a/stdlib/io/build.gradle +++ b/stdlib/io/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'commons-codec:commons-codec' testCompile ('org.apache.ws.commons.axiom:axiom-dom') { exclude group: 'org.codehaus.woodstox', module: 'woodstox-core-asl' diff --git a/stdlib/jdbc/build.gradle b/stdlib/jdbc/build.gradle index 2d546b69422d..b5ed174cb88c 100644 --- a/stdlib/jdbc/build.gradle +++ b/stdlib/jdbc/build.gradle @@ -85,7 +85,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' diff --git a/stdlib/jsonutils/build.gradle b/stdlib/jsonutils/build.gradle index 375be7168854..610cf813d71d 100644 --- a/stdlib/jsonutils/build.gradle +++ b/stdlib/jsonutils/build.gradle @@ -41,7 +41,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' } diff --git a/stdlib/math/build.gradle b/stdlib/math/build.gradle index 977e8261a2a5..4c4e44428210 100644 --- a/stdlib/math/build.gradle +++ b/stdlib/math/build.gradle @@ -37,7 +37,7 @@ dependencies { testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-test-utils') diff --git a/stdlib/runtime-api/build.gradle b/stdlib/runtime-api/build.gradle index 173ab6e58c03..3b6f769215cf 100644 --- a/stdlib/runtime-api/build.gradle +++ b/stdlib/runtime-api/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-java') implementation 'org.slf4j:slf4j-api' testCompile project(':ballerina-tool') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/socket/build.gradle b/stdlib/socket/build.gradle index 39549359b616..b6857e745c59 100644 --- a/stdlib/socket/build.gradle +++ b/stdlib/socket/build.gradle @@ -36,7 +36,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' testCompile 'org.awaitility:awaitility' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/task/build.gradle b/stdlib/task/build.gradle index ecc021ada71d..00eb6803f3b3 100644 --- a/stdlib/task/build.gradle +++ b/stdlib/task/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation 'org.quartz-scheduler:quartz' testCompile 'org.awaitility:awaitility' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-reflect') diff --git a/stdlib/time/build.gradle b/stdlib/time/build.gradle index 3ace60f353b1..c1c62eddc791 100644 --- a/stdlib/time/build.gradle +++ b/stdlib/time/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':ballerina-logging') implementation project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') diff --git a/stdlib/xmlutils/build.gradle b/stdlib/xmlutils/build.gradle index 62e3190d6851..21163cfa3eb9 100644 --- a/stdlib/xmlutils/build.gradle +++ b/stdlib/xmlutils/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' } diff --git a/tests/ballerina-compiler-plugin-test/build.gradle b/tests/ballerina-compiler-plugin-test/build.gradle index 0032876a1b4c..9a75ff744bb8 100644 --- a/tests/ballerina-compiler-plugin-test/build.gradle +++ b/tests/ballerina-compiler-plugin-test/build.gradle @@ -51,7 +51,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/tests/ballerina-spec-conformance-tests/build.gradle b/tests/ballerina-spec-conformance-tests/build.gradle index 95244ca5f49f..b80d10748ce7 100644 --- a/tests/ballerina-spec-conformance-tests/build.gradle +++ b/tests/ballerina-spec-conformance-tests/build.gradle @@ -29,7 +29,7 @@ dependencies { testCompile'org.testng:testng' testCompile 'com.h2database:h2' testCompile 'org.slf4j:slf4j-api' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':testerina:testerina-core', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 09c24073f510..6fb43d3ccdff 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -67,7 +67,7 @@ shadowJar { exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi.services')) exclude(dependency('org.slf4j:slf4j-log4j12')) exclude(dependency('org.slf4j:slf4j-simple')) - exclude(dependency('org.slf4j:slf4j-jdk14')) + exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) exclude(dependency('io.netty:netty-common')) exclude(dependency('io.netty:netty-buffer')) exclude(dependency('io.netty:netty-transport')) diff --git a/tests/ballerina-tools-integration-test/build.gradle b/tests/ballerina-tools-integration-test/build.gradle index 2baa60073863..9d0e814b175e 100644 --- a/tests/ballerina-tools-integration-test/build.gradle +++ b/tests/ballerina-tools-integration-test/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation project(':ballerina-packerina') implementation project(':ballerina-tool') implementation project(path: ':ballerina-test-utils', configuration: 'shadow') - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.awaitility:awaitility' testCompile 'commons-io:commons-io' diff --git a/tests/jballerina-debugger-integration-test/build.gradle b/tests/jballerina-debugger-integration-test/build.gradle index eb46163a4485..a31fcfdd2cae 100644 --- a/tests/jballerina-debugger-integration-test/build.gradle +++ b/tests/jballerina-debugger-integration-test/build.gradle @@ -29,7 +29,7 @@ dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j.debug', version: '0.8.1' testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.apache.commons:commons-lang3' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 2c5239db9325..6ffed59f504c 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -139,7 +139,7 @@ dependencies { testCompile project(':ballerina-mime') testCompile project(':ballerina-runtime') testCompile project(':ballerina-kafka').sourceSets.test.output - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'io.netty:netty-transport' testCompile 'io.netty:netty-codec-http' testCompile 'io.netty:netty-codec-http2' diff --git a/tests/jballerina-unit-test/build.gradle b/tests/jballerina-unit-test/build.gradle index bd793068e410..bc138cd41c8e 100644 --- a/tests/jballerina-unit-test/build.gradle +++ b/tests/jballerina-unit-test/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation 'org.testng:testng' testCompile 'org.awaitility:awaitility' testCompile 'com.zaxxer:HikariCP' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.hsqldb:hsqldb' testCompile 'org.mockito:mockito-all' testCompile 'io.netty:netty-transport' diff --git a/tests/openapi-integration-tests/build.gradle b/tests/openapi-integration-tests/build.gradle index f1885a712c3d..a84767d9e595 100644 --- a/tests/openapi-integration-tests/build.gradle +++ b/tests/openapi-integration-tests/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/testerina-integration-test/build.gradle b/tests/testerina-integration-test/build.gradle index 768bf261fca1..b001ea8addc2 100644 --- a/tests/testerina-integration-test/build.gradle +++ b/tests/testerina-integration-test/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') From 2bf0679392391613d93343721896f151d492f6d6 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 13 Sep 2024 15:12:13 +0530 Subject: [PATCH 02/17] Add log4j-1.2-api --- bvm/ballerina-rt/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index b4976e731940..7365c21cc2e2 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -74,6 +74,7 @@ dependencies { // Third party jars // config dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' + dist 'org.apache.logging.log4j:log4j-1.2-api:2.2' dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' From bc4549398950b013c87025ac66fb8390c58baa75 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 13 Sep 2024 15:25:58 +0530 Subject: [PATCH 03/17] Remove slf4j-api --- bvm/ballerina-rt/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index 7365c21cc2e2..1f2497167a68 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -75,7 +75,6 @@ dependencies { // config dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' dist 'org.apache.logging.log4j:log4j-1.2-api:2.2' - dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' dist 'org.apache.commons:commons-lang3:3.8.1' From 66e8185ee7b837ebeee7def2dc4788670672a3ea Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 13 Sep 2024 15:53:04 +0530 Subject: [PATCH 04/17] Remove slf4j-simple from java project --- gradle/javaProject.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 0369850a5159..38af182d3096 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -93,7 +93,6 @@ dependencies { implementation 'org.ow2.asm:asm-util:7.1' implementation 'org.ow2.asm:asm-tree:7.1' implementation 'org.scala-lang:scala-library:2.11.7' - implementation 'org.slf4j:slf4j-simple:1.7.26' implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' implementation 'org.testng:testng:6.14.3' implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' From 1ebe74542687add5bd577921a32f33a84a634253 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 15:30:02 +0530 Subject: [PATCH 05/17] Revert changes --- bvm/ballerina-core/build.gradle | 2 +- bvm/ballerina-rt/build.gradle | 4 ++-- gradle/javaProject.gradle | 3 ++- langlib/langlib-test/build.gradle | 2 +- language-server/modules/langserver-core/build.gradle | 2 +- misc/docerina/build.gradle | 2 +- .../modules/ballerina-to-openapi-generator/build.gradle | 2 +- misc/testerina/modules/testerina-core/build.gradle | 2 +- observelib/observe/build.gradle | 2 +- stdlib/auth/build.gradle | 2 +- stdlib/bir-old/build.gradle | 2 +- stdlib/bir/build.gradle | 2 +- stdlib/cache/build.gradle | 2 +- stdlib/config-api/build.gradle | 2 +- stdlib/crypto/build.gradle | 2 +- stdlib/database/jdbc2/build.gradle | 2 +- stdlib/email/build.gradle | 2 +- stdlib/encoding/build.gradle | 2 +- stdlib/file/build.gradle | 2 +- stdlib/filepath/build.gradle | 2 +- stdlib/io/build.gradle | 2 +- stdlib/jdbc/build.gradle | 2 +- stdlib/jsonutils/build.gradle | 2 +- stdlib/math/build.gradle | 2 +- stdlib/runtime-api/build.gradle | 2 +- stdlib/socket/build.gradle | 2 +- stdlib/task/build.gradle | 2 +- stdlib/time/build.gradle | 2 +- stdlib/xmlutils/build.gradle | 2 +- tests/ballerina-compiler-plugin-test/build.gradle | 2 +- tests/ballerina-spec-conformance-tests/build.gradle | 2 +- tests/ballerina-test-utils/build.gradle | 2 +- tests/ballerina-tools-integration-test/build.gradle | 2 +- tests/jballerina-debugger-integration-test/build.gradle | 2 +- tests/jballerina-integration-test/build.gradle | 2 +- tests/jballerina-unit-test/build.gradle | 2 +- tests/openapi-integration-tests/build.gradle | 2 +- tests/testerina-integration-test/build.gradle | 2 +- 38 files changed, 40 insertions(+), 39 deletions(-) diff --git a/bvm/ballerina-core/build.gradle b/bvm/ballerina-core/build.gradle index dc192b91e88c..80f80aed02a4 100644 --- a/bvm/ballerina-core/build.gradle +++ b/bvm/ballerina-core/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation 'io.opentracing:opentracing-util' implementation 'org.awaitility:awaitility' implementation 'com.zaxxer:HikariCP' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl' + implementation 'org.slf4j:slf4j-jdk14' implementation 'commons-codec:commons-codec' } diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index 1f2497167a68..d72f50951eea 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -73,8 +73,8 @@ dependencies { // Third party jars // config - dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' - dist 'org.apache.logging.log4j:log4j-1.2-api:2.2' + dist 'org.slf4j:slf4j-jdk14:1.7.22' + dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' dist 'org.apache.commons:commons-lang3:3.8.1' diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 38af182d3096..ca7a6db1b043 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -93,7 +93,8 @@ dependencies { implementation 'org.ow2.asm:asm-util:7.1' implementation 'org.ow2.asm:asm-tree:7.1' implementation 'org.scala-lang:scala-library:2.11.7' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' + implementation 'org.slf4j:slf4j-simple:1.7.26' + implementation 'org.slf4j:slf4j-jdk14:1.7.26' implementation 'org.testng:testng:6.14.3' implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' implementation 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' diff --git a/langlib/langlib-test/build.gradle b/langlib/langlib-test/build.gradle index fd6777897434..6a3eee163b08 100644 --- a/langlib/langlib-test/build.gradle +++ b/langlib/langlib-test/build.gradle @@ -55,7 +55,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' + testRuntime 'org.slf4j:slf4j-jdk14' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/language-server/modules/langserver-core/build.gradle b/language-server/modules/langserver-core/build.gradle index 00fd95ee4e73..21ec5aada46f 100644 --- a/language-server/modules/langserver-core/build.gradle +++ b/language-server/modules/langserver-core/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'io.netty:netty-buffer' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl' + implementation 'org.slf4j:slf4j-jdk14' implementation 'com.google.code.findbugs:jsr305' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j' implementation 'com.h2database:h2' diff --git a/misc/docerina/build.gradle b/misc/docerina/build.gradle index e2a7ddfea376..91835707cd3d 100644 --- a/misc/docerina/build.gradle +++ b/misc/docerina/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile 'org.testng:testng' testCompile project(':language-server:language-server-compiler') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' } diff --git a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle index 7a011a42cc83..acaeebdd23ba 100644 --- a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle +++ b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':language-server:language-server-compiler') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' } description = 'Ballerina - OpenApi Tooling - Ballerina To OpenApi' diff --git a/misc/testerina/modules/testerina-core/build.gradle b/misc/testerina/modules/testerina-core/build.gradle index 848b22c60007..1de0ad330dc5 100644 --- a/misc/testerina/modules/testerina-core/build.gradle +++ b/misc/testerina/modules/testerina-core/build.gradle @@ -57,7 +57,7 @@ dependencies { interopImports project(':ballerina-io') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'io.swagger.core.v3:swagger-models' testCompile 'io.swagger.parser.v3:swagger-parser' testCompile 'com.github.jknack:handlebars' diff --git a/observelib/observe/build.gradle b/observelib/observe/build.gradle index 219ebd216a73..c4030652361f 100644 --- a/observelib/observe/build.gradle +++ b/observelib/observe/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':metrics-extensions:ballerina-metrics-extension') implementation 'io.opentracing:opentracing-api' - testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' + testRuntime 'org.slf4j:slf4j-jdk14' baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-runtime-api', configuration: 'baloImplementation') diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle index da576a6082ed..5bd5816e109d 100644 --- a/stdlib/auth/build.gradle +++ b/stdlib/auth/build.gradle @@ -55,7 +55,7 @@ dependencies { interopImports project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-core') diff --git a/stdlib/bir-old/build.gradle b/stdlib/bir-old/build.gradle index 9b7683237437..c01c692468c0 100644 --- a/stdlib/bir-old/build.gradle +++ b/stdlib/bir-old/build.gradle @@ -31,7 +31,7 @@ dependencies { balo project(path: ':ballerina-bootstrapper', configuration: 'pack1') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' } description = 'Ballerina - BIR Model' diff --git a/stdlib/bir/build.gradle b/stdlib/bir/build.gradle index a2e9cb792037..95e48a668b50 100644 --- a/stdlib/bir/build.gradle +++ b/stdlib/bir/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-core') testCompile 'io.netty:netty-transport' testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' } description = 'Ballerina - BIR Model' diff --git a/stdlib/cache/build.gradle b/stdlib/cache/build.gradle index c3248f61293a..3bb14faf3d98 100644 --- a/stdlib/cache/build.gradle +++ b/stdlib/cache/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-runtime') implementation project(':ballerina-java') implementation 'commons-logging:commons-logging' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl' + implementation 'org.slf4j:slf4j-jdk14' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/config-api/build.gradle b/stdlib/config-api/build.gradle index daf42b62f231..60994cd5b414 100644 --- a/stdlib/config-api/build.gradle +++ b/stdlib/config-api/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-file') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.testng:testng' } diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle index d4f4931c17a5..f4b14543baa6 100644 --- a/stdlib/crypto/build.gradle +++ b/stdlib/crypto/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation project(':ballerina-java') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'commons-codec:commons-codec' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') diff --git a/stdlib/database/jdbc2/build.gradle b/stdlib/database/jdbc2/build.gradle index 6cbe1fe8b479..1a1a4b5d3c3b 100644 --- a/stdlib/database/jdbc2/build.gradle +++ b/stdlib/database/jdbc2/build.gradle @@ -55,7 +55,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' } diff --git a/stdlib/email/build.gradle b/stdlib/email/build.gradle index 4d0d10ddc587..31127d7fcd04 100644 --- a/stdlib/email/build.gradle +++ b/stdlib/email/build.gradle @@ -68,7 +68,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-io') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' + testCompile 'org.slf4j:slf4j-jdk14:1.7.22' testCompile 'com.icegreen:greenmail:1.5.11' } diff --git a/stdlib/encoding/build.gradle b/stdlib/encoding/build.gradle index 2a4e96c36da3..10636efba611 100644 --- a/stdlib/encoding/build.gradle +++ b/stdlib/encoding/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation project(':ballerina-runtime-api') implementation project(':ballerina-java') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(':ballerina-test-utils') diff --git a/stdlib/file/build.gradle b/stdlib/file/build.gradle index 5b8e2d063a26..b67a4c5359ab 100644 --- a/stdlib/file/build.gradle +++ b/stdlib/file/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' + testCompile 'org.slf4j:slf4j-jdk14:1.7.22' } createBalo { diff --git a/stdlib/filepath/build.gradle b/stdlib/filepath/build.gradle index b0d3f10016a0..d774e52615eb 100644 --- a/stdlib/filepath/build.gradle +++ b/stdlib/filepath/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile project(':ballerina-file') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4' + testCompile 'org.slf4j:slf4j-jdk14:1.7.22' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/io/build.gradle b/stdlib/io/build.gradle index 2ffdea93aaaf..59764ce8f1b2 100644 --- a/stdlib/io/build.gradle +++ b/stdlib/io/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'commons-codec:commons-codec' testCompile ('org.apache.ws.commons.axiom:axiom-dom') { exclude group: 'org.codehaus.woodstox', module: 'woodstox-core-asl' diff --git a/stdlib/jdbc/build.gradle b/stdlib/jdbc/build.gradle index b5ed174cb88c..2d546b69422d 100644 --- a/stdlib/jdbc/build.gradle +++ b/stdlib/jdbc/build.gradle @@ -85,7 +85,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' diff --git a/stdlib/jsonutils/build.gradle b/stdlib/jsonutils/build.gradle index 610cf813d71d..375be7168854 100644 --- a/stdlib/jsonutils/build.gradle +++ b/stdlib/jsonutils/build.gradle @@ -41,7 +41,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'com.h2database:h2' } diff --git a/stdlib/math/build.gradle b/stdlib/math/build.gradle index 4c4e44428210..977e8261a2a5 100644 --- a/stdlib/math/build.gradle +++ b/stdlib/math/build.gradle @@ -37,7 +37,7 @@ dependencies { testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-test-utils') diff --git a/stdlib/runtime-api/build.gradle b/stdlib/runtime-api/build.gradle index 3b6f769215cf..173ab6e58c03 100644 --- a/stdlib/runtime-api/build.gradle +++ b/stdlib/runtime-api/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-java') implementation 'org.slf4j:slf4j-api' testCompile project(':ballerina-tool') - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.testng:testng' baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/socket/build.gradle b/stdlib/socket/build.gradle index b6857e745c59..39549359b616 100644 --- a/stdlib/socket/build.gradle +++ b/stdlib/socket/build.gradle @@ -36,7 +36,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' testCompile 'org.awaitility:awaitility' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/task/build.gradle b/stdlib/task/build.gradle index 00eb6803f3b3..ecc021ada71d 100644 --- a/stdlib/task/build.gradle +++ b/stdlib/task/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation 'org.quartz-scheduler:quartz' testCompile 'org.awaitility:awaitility' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-reflect') diff --git a/stdlib/time/build.gradle b/stdlib/time/build.gradle index c1c62eddc791..3ace60f353b1 100644 --- a/stdlib/time/build.gradle +++ b/stdlib/time/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':ballerina-logging') implementation project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') diff --git a/stdlib/xmlutils/build.gradle b/stdlib/xmlutils/build.gradle index 21163cfa3eb9..62e3190d6851 100644 --- a/stdlib/xmlutils/build.gradle +++ b/stdlib/xmlutils/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'com.h2database:h2' } diff --git a/tests/ballerina-compiler-plugin-test/build.gradle b/tests/ballerina-compiler-plugin-test/build.gradle index 9a75ff744bb8..0032876a1b4c 100644 --- a/tests/ballerina-compiler-plugin-test/build.gradle +++ b/tests/ballerina-compiler-plugin-test/build.gradle @@ -51,7 +51,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' + testRuntime 'org.slf4j:slf4j-jdk14' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/tests/ballerina-spec-conformance-tests/build.gradle b/tests/ballerina-spec-conformance-tests/build.gradle index b80d10748ce7..95244ca5f49f 100644 --- a/tests/ballerina-spec-conformance-tests/build.gradle +++ b/tests/ballerina-spec-conformance-tests/build.gradle @@ -29,7 +29,7 @@ dependencies { testCompile'org.testng:testng' testCompile 'com.h2database:h2' testCompile 'org.slf4j:slf4j-api' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' baloImplementation project(path: ':testerina:testerina-core', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 6fb43d3ccdff..09c24073f510 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -67,7 +67,7 @@ shadowJar { exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi.services')) exclude(dependency('org.slf4j:slf4j-log4j12')) exclude(dependency('org.slf4j:slf4j-simple')) - exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) + exclude(dependency('org.slf4j:slf4j-jdk14')) exclude(dependency('io.netty:netty-common')) exclude(dependency('io.netty:netty-buffer')) exclude(dependency('io.netty:netty-transport')) diff --git a/tests/ballerina-tools-integration-test/build.gradle b/tests/ballerina-tools-integration-test/build.gradle index 9d0e814b175e..2baa60073863 100644 --- a/tests/ballerina-tools-integration-test/build.gradle +++ b/tests/ballerina-tools-integration-test/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation project(':ballerina-packerina') implementation project(':ballerina-tool') implementation project(path: ':ballerina-test-utils', configuration: 'shadow') - implementation 'org.apache.logging.log4j:log4j-slf4j-impl' + implementation 'org.slf4j:slf4j-jdk14' testCompile 'org.awaitility:awaitility' testCompile 'commons-io:commons-io' diff --git a/tests/jballerina-debugger-integration-test/build.gradle b/tests/jballerina-debugger-integration-test/build.gradle index a31fcfdd2cae..eb46163a4485 100644 --- a/tests/jballerina-debugger-integration-test/build.gradle +++ b/tests/jballerina-debugger-integration-test/build.gradle @@ -29,7 +29,7 @@ dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j.debug', version: '0.8.1' testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.apache.commons:commons-lang3' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 6ffed59f504c..2c5239db9325 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -139,7 +139,7 @@ dependencies { testCompile project(':ballerina-mime') testCompile project(':ballerina-runtime') testCompile project(':ballerina-kafka').sourceSets.test.output - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'io.netty:netty-transport' testCompile 'io.netty:netty-codec-http' testCompile 'io.netty:netty-codec-http2' diff --git a/tests/jballerina-unit-test/build.gradle b/tests/jballerina-unit-test/build.gradle index bc138cd41c8e..bd793068e410 100644 --- a/tests/jballerina-unit-test/build.gradle +++ b/tests/jballerina-unit-test/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation 'org.testng:testng' testCompile 'org.awaitility:awaitility' testCompile 'com.zaxxer:HikariCP' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' testCompile 'org.hsqldb:hsqldb' testCompile 'org.mockito:mockito-all' testCompile 'io.netty:netty-transport' diff --git a/tests/openapi-integration-tests/build.gradle b/tests/openapi-integration-tests/build.gradle index a84767d9e595..f1885a712c3d 100644 --- a/tests/openapi-integration-tests/build.gradle +++ b/tests/openapi-integration-tests/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/testerina-integration-test/build.gradle b/tests/testerina-integration-test/build.gradle index b001ea8addc2..768bf261fca1 100644 --- a/tests/testerina-integration-test/build.gradle +++ b/tests/testerina-integration-test/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' + testCompile 'org.slf4j:slf4j-jdk14' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') From 26ffc43d715ab7b1b82f11d50e868a6198886034 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 16:26:15 +0530 Subject: [PATCH 06/17] Use log4j-slf4j-impl:2.24.0 --- bvm/ballerina-rt/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index d72f50951eea..0369f2e52ba7 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -73,7 +73,7 @@ dependencies { // Third party jars // config - dist 'org.slf4j:slf4j-jdk14:1.7.22' + dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' From 743725e58346b8b230cf2706883391b74b737345 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 16:50:20 +0530 Subject: [PATCH 07/17] Replace Gradle files with log4j-slf4j-impl --- bvm/ballerina-core/build.gradle | 2 +- gradle/javaProject.gradle | 2 +- langlib/langlib-test/build.gradle | 2 +- language-server/modules/langserver-core/build.gradle | 2 +- misc/docerina/build.gradle | 2 +- .../modules/ballerina-to-openapi-generator/build.gradle | 2 +- misc/testerina/modules/testerina-core/build.gradle | 2 +- observelib/observe/build.gradle | 2 +- stdlib/auth/build.gradle | 2 +- stdlib/bir-old/build.gradle | 2 +- stdlib/bir/build.gradle | 2 +- stdlib/cache/build.gradle | 2 +- stdlib/config-api/build.gradle | 2 +- stdlib/crypto/build.gradle | 2 +- stdlib/database/jdbc2/build.gradle | 2 +- stdlib/email/build.gradle | 2 +- stdlib/encoding/build.gradle | 2 +- stdlib/file/build.gradle | 2 +- stdlib/filepath/build.gradle | 2 +- stdlib/io/build.gradle | 2 +- stdlib/jdbc/build.gradle | 2 +- stdlib/jsonutils/build.gradle | 2 +- stdlib/math/build.gradle | 2 +- stdlib/runtime-api/build.gradle | 2 +- stdlib/socket/build.gradle | 2 +- stdlib/task/build.gradle | 2 +- stdlib/time/build.gradle | 2 +- stdlib/xmlutils/build.gradle | 2 +- tests/ballerina-compiler-plugin-test/build.gradle | 2 +- tests/ballerina-spec-conformance-tests/build.gradle | 2 +- tests/ballerina-test-utils/build.gradle | 2 +- tests/ballerina-tools-integration-test/build.gradle | 2 +- tests/jballerina-debugger-integration-test/build.gradle | 2 +- tests/jballerina-integration-test/build.gradle | 2 +- tests/jballerina-unit-test/build.gradle | 2 +- tests/openapi-integration-tests/build.gradle | 2 +- tests/testerina-integration-test/build.gradle | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/bvm/ballerina-core/build.gradle b/bvm/ballerina-core/build.gradle index 80f80aed02a4..dc192b91e88c 100644 --- a/bvm/ballerina-core/build.gradle +++ b/bvm/ballerina-core/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation 'io.opentracing:opentracing-util' implementation 'org.awaitility:awaitility' implementation 'com.zaxxer:HikariCP' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'commons-codec:commons-codec' } diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index ca7a6db1b043..04fe49217333 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -94,7 +94,7 @@ dependencies { implementation 'org.ow2.asm:asm-tree:7.1' implementation 'org.scala-lang:scala-library:2.11.7' implementation 'org.slf4j:slf4j-simple:1.7.26' - implementation 'org.slf4j:slf4j-jdk14:1.7.26' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' implementation 'org.testng:testng:6.14.3' implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7' implementation 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' diff --git a/langlib/langlib-test/build.gradle b/langlib/langlib-test/build.gradle index 6a3eee163b08..fd6777897434 100644 --- a/langlib/langlib-test/build.gradle +++ b/langlib/langlib-test/build.gradle @@ -55,7 +55,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/language-server/modules/langserver-core/build.gradle b/language-server/modules/langserver-core/build.gradle index 21ec5aada46f..00fd95ee4e73 100644 --- a/language-server/modules/langserver-core/build.gradle +++ b/language-server/modules/langserver-core/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'io.netty:netty-buffer' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'com.google.code.findbugs:jsr305' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j' implementation 'com.h2database:h2' diff --git a/misc/docerina/build.gradle b/misc/docerina/build.gradle index 91835707cd3d..e2a7ddfea376 100644 --- a/misc/docerina/build.gradle +++ b/misc/docerina/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile 'org.testng:testng' testCompile project(':language-server:language-server-compiler') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } diff --git a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle index acaeebdd23ba..7a011a42cc83 100644 --- a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle +++ b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':language-server:language-server-compiler') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - OpenApi Tooling - Ballerina To OpenApi' diff --git a/misc/testerina/modules/testerina-core/build.gradle b/misc/testerina/modules/testerina-core/build.gradle index 1de0ad330dc5..848b22c60007 100644 --- a/misc/testerina/modules/testerina-core/build.gradle +++ b/misc/testerina/modules/testerina-core/build.gradle @@ -57,7 +57,7 @@ dependencies { interopImports project(':ballerina-io') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'io.swagger.core.v3:swagger-models' testCompile 'io.swagger.parser.v3:swagger-parser' testCompile 'com.github.jknack:handlebars' diff --git a/observelib/observe/build.gradle b/observelib/observe/build.gradle index c4030652361f..219ebd216a73 100644 --- a/observelib/observe/build.gradle +++ b/observelib/observe/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':metrics-extensions:ballerina-metrics-extension') implementation 'io.opentracing:opentracing-api' - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-runtime-api', configuration: 'baloImplementation') diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle index 5bd5816e109d..da576a6082ed 100644 --- a/stdlib/auth/build.gradle +++ b/stdlib/auth/build.gradle @@ -55,7 +55,7 @@ dependencies { interopImports project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-core') diff --git a/stdlib/bir-old/build.gradle b/stdlib/bir-old/build.gradle index c01c692468c0..9b7683237437 100644 --- a/stdlib/bir-old/build.gradle +++ b/stdlib/bir-old/build.gradle @@ -31,7 +31,7 @@ dependencies { balo project(path: ':ballerina-bootstrapper', configuration: 'pack1') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - BIR Model' diff --git a/stdlib/bir/build.gradle b/stdlib/bir/build.gradle index 95e48a668b50..a2e9cb792037 100644 --- a/stdlib/bir/build.gradle +++ b/stdlib/bir/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-core') testCompile 'io.netty:netty-transport' testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } description = 'Ballerina - BIR Model' diff --git a/stdlib/cache/build.gradle b/stdlib/cache/build.gradle index 3bb14faf3d98..c3248f61293a 100644 --- a/stdlib/cache/build.gradle +++ b/stdlib/cache/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-runtime') implementation project(':ballerina-java') implementation 'commons-logging:commons-logging' - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/config-api/build.gradle b/stdlib/config-api/build.gradle index 60994cd5b414..daf42b62f231 100644 --- a/stdlib/config-api/build.gradle +++ b/stdlib/config-api/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-file') testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' } diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle index f4b14543baa6..d4f4931c17a5 100644 --- a/stdlib/crypto/build.gradle +++ b/stdlib/crypto/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation project(':ballerina-java') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'commons-codec:commons-codec' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') diff --git a/stdlib/database/jdbc2/build.gradle b/stdlib/database/jdbc2/build.gradle index 1a1a4b5d3c3b..6cbe1fe8b479 100644 --- a/stdlib/database/jdbc2/build.gradle +++ b/stdlib/database/jdbc2/build.gradle @@ -55,7 +55,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' } diff --git a/stdlib/email/build.gradle b/stdlib/email/build.gradle index 31127d7fcd04..ae459c3b5940 100644 --- a/stdlib/email/build.gradle +++ b/stdlib/email/build.gradle @@ -68,7 +68,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-io') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' testCompile 'com.icegreen:greenmail:1.5.11' } diff --git a/stdlib/encoding/build.gradle b/stdlib/encoding/build.gradle index 10636efba611..2a4e96c36da3 100644 --- a/stdlib/encoding/build.gradle +++ b/stdlib/encoding/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation project(':ballerina-runtime-api') implementation project(':ballerina-java') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile project(':ballerina-test-utils') diff --git a/stdlib/file/build.gradle b/stdlib/file/build.gradle index b67a4c5359ab..73a0819ce313 100644 --- a/stdlib/file/build.gradle +++ b/stdlib/file/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng:6.13.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' } createBalo { diff --git a/stdlib/filepath/build.gradle b/stdlib/filepath/build.gradle index d774e52615eb..e69a0f5605a4 100644 --- a/stdlib/filepath/build.gradle +++ b/stdlib/filepath/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile project(':ballerina-file') - testCompile 'org.slf4j:slf4j-jdk14:1.7.22' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation') diff --git a/stdlib/io/build.gradle b/stdlib/io/build.gradle index 59764ce8f1b2..2ffdea93aaaf 100644 --- a/stdlib/io/build.gradle +++ b/stdlib/io/build.gradle @@ -40,7 +40,7 @@ dependencies { testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'commons-codec:commons-codec' testCompile ('org.apache.ws.commons.axiom:axiom-dom') { exclude group: 'org.codehaus.woodstox', module: 'woodstox-core-asl' diff --git a/stdlib/jdbc/build.gradle b/stdlib/jdbc/build.gradle index 2d546b69422d..b5ed174cb88c 100644 --- a/stdlib/jdbc/build.gradle +++ b/stdlib/jdbc/build.gradle @@ -85,7 +85,7 @@ dependencies { testCompile project(':ballerina-transactions') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' testCompile 'org.hsqldb:hsqldb' diff --git a/stdlib/jsonutils/build.gradle b/stdlib/jsonutils/build.gradle index 375be7168854..610cf813d71d 100644 --- a/stdlib/jsonutils/build.gradle +++ b/stdlib/jsonutils/build.gradle @@ -41,7 +41,7 @@ dependencies { testCompile project(':ballerina-core') testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' } diff --git a/stdlib/math/build.gradle b/stdlib/math/build.gradle index 977e8261a2a5..4c4e44428210 100644 --- a/stdlib/math/build.gradle +++ b/stdlib/math/build.gradle @@ -37,7 +37,7 @@ dependencies { testCompile project(path: ':ballerina-test-common', configuration: 'tests') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-test-utils') diff --git a/stdlib/runtime-api/build.gradle b/stdlib/runtime-api/build.gradle index 173ab6e58c03..3b6f769215cf 100644 --- a/stdlib/runtime-api/build.gradle +++ b/stdlib/runtime-api/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ballerina-java') implementation 'org.slf4j:slf4j-api' testCompile project(':ballerina-tool') - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/socket/build.gradle b/stdlib/socket/build.gradle index 39549359b616..b6857e745c59 100644 --- a/stdlib/socket/build.gradle +++ b/stdlib/socket/build.gradle @@ -36,7 +36,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' testCompile 'org.awaitility:awaitility' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':ballerina-io', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-java', configuration: 'baloImplementation') diff --git a/stdlib/task/build.gradle b/stdlib/task/build.gradle index ecc021ada71d..00eb6803f3b3 100644 --- a/stdlib/task/build.gradle +++ b/stdlib/task/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation 'org.quartz-scheduler:quartz' testCompile 'org.awaitility:awaitility' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.testng:testng' testCompile project(path: ':ballerina-test-utils', configuration: 'shadow') testCompile project(':ballerina-reflect') diff --git a/stdlib/time/build.gradle b/stdlib/time/build.gradle index 3ace60f353b1..c1c62eddc791 100644 --- a/stdlib/time/build.gradle +++ b/stdlib/time/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':ballerina-logging') implementation project(':ballerina-runtime-api') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile project(':ballerina-test-utils') testCompile project(':ballerina-reflect') testCompile project(':ballerina-core') diff --git a/stdlib/xmlutils/build.gradle b/stdlib/xmlutils/build.gradle index 62e3190d6851..21163cfa3eb9 100644 --- a/stdlib/xmlutils/build.gradle +++ b/stdlib/xmlutils/build.gradle @@ -54,7 +54,7 @@ dependencies { testCompile project(':ballerina-file') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'com.h2database:h2' } diff --git a/tests/ballerina-compiler-plugin-test/build.gradle b/tests/ballerina-compiler-plugin-test/build.gradle index 0032876a1b4c..9a75ff744bb8 100644 --- a/tests/ballerina-compiler-plugin-test/build.gradle +++ b/tests/ballerina-compiler-plugin-test/build.gradle @@ -51,7 +51,7 @@ dependencies { testRuntime project(':ballerina-lang:bool') testRuntime project(':ballerina-runtime') testRuntime project(':ballerina-lang:internal') - testRuntime 'org.slf4j:slf4j-jdk14' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl' baloTestImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') baloTestImplementation project(path: ':ballerina-lang:array', configuration: 'baloImplementation') diff --git a/tests/ballerina-spec-conformance-tests/build.gradle b/tests/ballerina-spec-conformance-tests/build.gradle index 95244ca5f49f..b80d10748ce7 100644 --- a/tests/ballerina-spec-conformance-tests/build.gradle +++ b/tests/ballerina-spec-conformance-tests/build.gradle @@ -29,7 +29,7 @@ dependencies { testCompile'org.testng:testng' testCompile 'com.h2database:h2' testCompile 'org.slf4j:slf4j-api' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' baloImplementation project(path: ':testerina:testerina-core', configuration: 'baloImplementation') baloImplementation project(path: ':ballerina-lang:annotations', configuration: 'baloImplementation') diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 09c24073f510..6fb43d3ccdff 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -67,7 +67,7 @@ shadowJar { exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi.services')) exclude(dependency('org.slf4j:slf4j-log4j12')) exclude(dependency('org.slf4j:slf4j-simple')) - exclude(dependency('org.slf4j:slf4j-jdk14')) + exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) exclude(dependency('io.netty:netty-common')) exclude(dependency('io.netty:netty-buffer')) exclude(dependency('io.netty:netty-transport')) diff --git a/tests/ballerina-tools-integration-test/build.gradle b/tests/ballerina-tools-integration-test/build.gradle index 2baa60073863..9d0e814b175e 100644 --- a/tests/ballerina-tools-integration-test/build.gradle +++ b/tests/ballerina-tools-integration-test/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation project(':ballerina-packerina') implementation project(':ballerina-tool') implementation project(path: ':ballerina-test-utils', configuration: 'shadow') - implementation 'org.slf4j:slf4j-jdk14' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.awaitility:awaitility' testCompile 'commons-io:commons-io' diff --git a/tests/jballerina-debugger-integration-test/build.gradle b/tests/jballerina-debugger-integration-test/build.gradle index eb46163a4485..a31fcfdd2cae 100644 --- a/tests/jballerina-debugger-integration-test/build.gradle +++ b/tests/jballerina-debugger-integration-test/build.gradle @@ -29,7 +29,7 @@ dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j.debug', version: '0.8.1' testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.apache.commons:commons-lang3' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 2c5239db9325..6ffed59f504c 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -139,7 +139,7 @@ dependencies { testCompile project(':ballerina-mime') testCompile project(':ballerina-runtime') testCompile project(':ballerina-kafka').sourceSets.test.output - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'io.netty:netty-transport' testCompile 'io.netty:netty-codec-http' testCompile 'io.netty:netty-codec-http2' diff --git a/tests/jballerina-unit-test/build.gradle b/tests/jballerina-unit-test/build.gradle index bd793068e410..bc138cd41c8e 100644 --- a/tests/jballerina-unit-test/build.gradle +++ b/tests/jballerina-unit-test/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation 'org.testng:testng' testCompile 'org.awaitility:awaitility' testCompile 'com.zaxxer:HikariCP' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' testCompile 'org.hsqldb:hsqldb' testCompile 'org.mockito:mockito-all' testCompile 'io.netty:netty-transport' diff --git a/tests/openapi-integration-tests/build.gradle b/tests/openapi-integration-tests/build.gradle index f1885a712c3d..a84767d9e595 100644 --- a/tests/openapi-integration-tests/build.gradle +++ b/tests/openapi-integration-tests/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') diff --git a/tests/testerina-integration-test/build.gradle b/tests/testerina-integration-test/build.gradle index 768bf261fca1..b001ea8addc2 100644 --- a/tests/testerina-integration-test/build.gradle +++ b/tests/testerina-integration-test/build.gradle @@ -28,7 +28,7 @@ configurations { dependencies { jballerinaTools project(path: ':jballerina-tools', configuration: 'zip') testCompile 'org.testng:testng' - testCompile 'org.slf4j:slf4j-jdk14' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'info.picocli:picocli' implementation project(path: ':ballerina-test-utils') From c320046f69074cc9ec0f6821d6de50bec6e4570c Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 17:06:34 +0530 Subject: [PATCH 08/17] Exclude log4j-slf4j-impl dependency --- bvm/ballerina-core/build.gradle | 2 +- cli/ballerina-cli-module/build.gradle | 2 +- cli/ballerina-packerina/build.gradle | 2 +- gradle/balNativeLibProject.gradle | 2 +- langlib/langlib-test/build.gradle | 2 +- observelib/observe/build.gradle | 2 +- stdlib/auth/build.gradle | 2 +- stdlib/crypto/build.gradle | 2 +- stdlib/database/jdbc2/build.gradle | 2 +- stdlib/email/build.gradle | 2 +- stdlib/encoding/build.gradle | 2 +- stdlib/file/build.gradle | 2 +- stdlib/grpc/build.gradle | 2 +- stdlib/http/build.gradle | 2 +- stdlib/io/build.gradle | 2 +- stdlib/jdbc/build.gradle | 2 +- stdlib/jsonutils/build.gradle | 2 +- stdlib/jwt/build.gradle | 2 +- stdlib/ldap/build.gradle | 2 +- stdlib/math/build.gradle | 2 +- stdlib/messaging/kafka/build.gradle | 2 +- stdlib/messaging/nats/build.gradle | 2 +- stdlib/messaging/rabbitmq/build.gradle | 2 +- stdlib/mime/build.gradle | 2 +- stdlib/oauth2/build.gradle | 2 +- stdlib/socket/build.gradle | 2 +- stdlib/task/build.gradle | 2 +- stdlib/time/build.gradle | 2 +- stdlib/transactions/build.gradle | 2 +- stdlib/xmlutils/build.gradle | 2 +- tests/ballerina-compiler-plugin-test/build.gradle | 2 +- tests/ballerina-spec-conformance-tests/build.gradle | 2 +- tests/ballerina-test-utils/build.gradle | 2 +- tests/ballerina-tools-integration-test/build.gradle | 2 +- tests/jballerina-bstring-unit-test/build.gradle | 2 +- tests/jballerina-unit-test/build.gradle | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bvm/ballerina-core/build.gradle b/bvm/ballerina-core/build.gradle index dc192b91e88c..ecea40ad2743 100644 --- a/bvm/ballerina-core/build.gradle +++ b/bvm/ballerina-core/build.gradle @@ -63,7 +63,7 @@ configurations { exclude group: 'org.apache.servicemix.bundles', module: 'org.apache.servicemix.bundles.commons-beanutils' exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-log4j2' - exclude group: 'org.slf4j', module: 'slf4j-log4j12' + exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' } } diff --git a/cli/ballerina-cli-module/build.gradle b/cli/ballerina-cli-module/build.gradle index e16cfcc37c66..0f0c67fb1414 100644 --- a/cli/ballerina-cli-module/build.gradle +++ b/cli/ballerina-cli-module/build.gradle @@ -21,7 +21,7 @@ configurations { birJar bir birJarCompile { transitive false } - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/cli/ballerina-packerina/build.gradle b/cli/ballerina-packerina/build.gradle index 91119dc94033..d5fb71c20b2c 100644 --- a/cli/ballerina-packerina/build.gradle +++ b/cli/ballerina-packerina/build.gradle @@ -21,7 +21,7 @@ configurations { birJar bir birJarCompile { transitive false } - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/gradle/balNativeLibProject.gradle b/gradle/balNativeLibProject.gradle index 70b8386f1766..01ad86771d5a 100644 --- a/gradle/balNativeLibProject.gradle +++ b/gradle/balNativeLibProject.gradle @@ -190,7 +190,7 @@ publishing { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/langlib/langlib-test/build.gradle b/langlib/langlib-test/build.gradle index fd6777897434..f99a5f74aae7 100644 --- a/langlib/langlib-test/build.gradle +++ b/langlib/langlib-test/build.gradle @@ -98,7 +98,7 @@ test { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/observelib/observe/build.gradle b/observelib/observe/build.gradle index 219ebd216a73..7b4d96708dc1 100644 --- a/observelib/observe/build.gradle +++ b/observelib/observe/build.gradle @@ -52,7 +52,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle index da576a6082ed..a80a747e03e7 100644 --- a/stdlib/auth/build.gradle +++ b/stdlib/auth/build.gradle @@ -83,7 +83,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle index d4f4931c17a5..ab13d208bfc9 100644 --- a/stdlib/crypto/build.gradle +++ b/stdlib/crypto/build.gradle @@ -55,7 +55,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/database/jdbc2/build.gradle b/stdlib/database/jdbc2/build.gradle index 6cbe1fe8b479..b7b0345e4444 100644 --- a/stdlib/database/jdbc2/build.gradle +++ b/stdlib/database/jdbc2/build.gradle @@ -61,7 +61,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/email/build.gradle b/stdlib/email/build.gradle index ae459c3b5940..33c4e92ae77f 100644 --- a/stdlib/email/build.gradle +++ b/stdlib/email/build.gradle @@ -77,7 +77,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/encoding/build.gradle b/stdlib/encoding/build.gradle index 2a4e96c36da3..ab18aaa161a8 100644 --- a/stdlib/encoding/build.gradle +++ b/stdlib/encoding/build.gradle @@ -52,7 +52,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/file/build.gradle b/stdlib/file/build.gradle index 73a0819ce313..0f4aaf0b5a98 100644 --- a/stdlib/file/build.gradle +++ b/stdlib/file/build.gradle @@ -56,7 +56,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/grpc/build.gradle b/stdlib/grpc/build.gradle index 8d67f6dcf4cd..ba90b25c7c43 100644 --- a/stdlib/grpc/build.gradle +++ b/stdlib/grpc/build.gradle @@ -29,7 +29,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/http/build.gradle b/stdlib/http/build.gradle index 25e61f05a077..1948dcaba3fa 100644 --- a/stdlib/http/build.gradle +++ b/stdlib/http/build.gradle @@ -114,7 +114,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/io/build.gradle b/stdlib/io/build.gradle index 2ffdea93aaaf..7027dc95279d 100644 --- a/stdlib/io/build.gradle +++ b/stdlib/io/build.gradle @@ -58,7 +58,7 @@ createBalo { description = 'Ballerina - I/O' configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jdbc/build.gradle b/stdlib/jdbc/build.gradle index b5ed174cb88c..44bcbf0fa8d3 100644 --- a/stdlib/jdbc/build.gradle +++ b/stdlib/jdbc/build.gradle @@ -93,7 +93,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jsonutils/build.gradle b/stdlib/jsonutils/build.gradle index 610cf813d71d..d316a26a0ed6 100644 --- a/stdlib/jsonutils/build.gradle +++ b/stdlib/jsonutils/build.gradle @@ -52,7 +52,7 @@ createBalo { description = 'Ballerina - Json Utils' configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jwt/build.gradle b/stdlib/jwt/build.gradle index ff4d01964f82..0df8ec76e9d9 100644 --- a/stdlib/jwt/build.gradle +++ b/stdlib/jwt/build.gradle @@ -93,7 +93,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/ldap/build.gradle b/stdlib/ldap/build.gradle index a34279c09a67..a7f3a371a95f 100644 --- a/stdlib/ldap/build.gradle +++ b/stdlib/ldap/build.gradle @@ -66,7 +66,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/math/build.gradle b/stdlib/math/build.gradle index 4c4e44428210..7b1af9692911 100644 --- a/stdlib/math/build.gradle +++ b/stdlib/math/build.gradle @@ -55,7 +55,7 @@ createBalo { description = 'Ballerina - Math' configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/kafka/build.gradle b/stdlib/messaging/kafka/build.gradle index bc679a0d31ac..483fd8ebbf86 100644 --- a/stdlib/messaging/kafka/build.gradle +++ b/stdlib/messaging/kafka/build.gradle @@ -99,7 +99,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/nats/build.gradle b/stdlib/messaging/nats/build.gradle index 44ead2fa8585..3e18cda07922 100644 --- a/stdlib/messaging/nats/build.gradle +++ b/stdlib/messaging/nats/build.gradle @@ -30,7 +30,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/rabbitmq/build.gradle b/stdlib/messaging/rabbitmq/build.gradle index 872673698400..7fe6312c3261 100644 --- a/stdlib/messaging/rabbitmq/build.gradle +++ b/stdlib/messaging/rabbitmq/build.gradle @@ -60,7 +60,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/mime/build.gradle b/stdlib/mime/build.gradle index 8c3e4feffb37..3ecccbc06711 100644 --- a/stdlib/mime/build.gradle +++ b/stdlib/mime/build.gradle @@ -26,7 +26,7 @@ configurations.testCompileClasspath { configurations { tests - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/oauth2/build.gradle b/stdlib/oauth2/build.gradle index a08519bcf601..5a0b718e084a 100644 --- a/stdlib/oauth2/build.gradle +++ b/stdlib/oauth2/build.gradle @@ -78,7 +78,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/socket/build.gradle b/stdlib/socket/build.gradle index b6857e745c59..c6c66201eb26 100644 --- a/stdlib/socket/build.gradle +++ b/stdlib/socket/build.gradle @@ -46,7 +46,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/task/build.gradle b/stdlib/task/build.gradle index 00eb6803f3b3..2309d8023ea8 100644 --- a/stdlib/task/build.gradle +++ b/stdlib/task/build.gradle @@ -25,7 +25,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/time/build.gradle b/stdlib/time/build.gradle index c1c62eddc791..a938fb4eabb6 100644 --- a/stdlib/time/build.gradle +++ b/stdlib/time/build.gradle @@ -50,7 +50,7 @@ createBalo { description = 'Ballerina - Time' configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/transactions/build.gradle b/stdlib/transactions/build.gradle index d64ef927ac48..c8756d8c208b 100644 --- a/stdlib/transactions/build.gradle +++ b/stdlib/transactions/build.gradle @@ -83,7 +83,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/xmlutils/build.gradle b/stdlib/xmlutils/build.gradle index 21163cfa3eb9..c0c4efa9ed6c 100644 --- a/stdlib/xmlutils/build.gradle +++ b/stdlib/xmlutils/build.gradle @@ -65,7 +65,7 @@ createBalo { description = 'Ballerina - Xmlutils' configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/ballerina-compiler-plugin-test/build.gradle b/tests/ballerina-compiler-plugin-test/build.gradle index 9a75ff744bb8..3e054e51fd8e 100644 --- a/tests/ballerina-compiler-plugin-test/build.gradle +++ b/tests/ballerina-compiler-plugin-test/build.gradle @@ -96,7 +96,7 @@ test { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/ballerina-spec-conformance-tests/build.gradle b/tests/ballerina-spec-conformance-tests/build.gradle index b80d10748ce7..7ccefe3c2b07 100644 --- a/tests/ballerina-spec-conformance-tests/build.gradle +++ b/tests/ballerina-spec-conformance-tests/build.gradle @@ -54,7 +54,7 @@ test { } configurations { - testImplementation.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testImplementation.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testImplementation.exclude group: 'com.fasterxml.woodstox', module: 'woodstox-core' testImplementation.exclude group: 'org.codehaus.woodstox', module: 'stax2-api' } diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 6fb43d3ccdff..6b1a758d704a 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -65,7 +65,7 @@ shadowJar { exclude(dependency('org.ops4j.pax.logging:pax-logging-api')) exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi')) exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi.services')) - exclude(dependency('org.slf4j:slf4j-log4j12')) + exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) exclude(dependency('org.slf4j:slf4j-simple')) exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) exclude(dependency('io.netty:netty-common')) diff --git a/tests/ballerina-tools-integration-test/build.gradle b/tests/ballerina-tools-integration-test/build.gradle index 9d0e814b175e..697240ba958f 100644 --- a/tests/ballerina-tools-integration-test/build.gradle +++ b/tests/ballerina-tools-integration-test/build.gradle @@ -68,7 +68,7 @@ test { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' } diff --git a/tests/jballerina-bstring-unit-test/build.gradle b/tests/jballerina-bstring-unit-test/build.gradle index 9c70ed049e9d..9173f3ed5670 100644 --- a/tests/jballerina-bstring-unit-test/build.gradle +++ b/tests/jballerina-bstring-unit-test/build.gradle @@ -107,7 +107,7 @@ test { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/jballerina-unit-test/build.gradle b/tests/jballerina-unit-test/build.gradle index bc138cd41c8e..aea648a99181 100644 --- a/tests/jballerina-unit-test/build.gradle +++ b/tests/jballerina-unit-test/build.gradle @@ -127,7 +127,7 @@ test { } configurations { - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } From 5d5cb8812fb10a5c32df5905027a969bbdb37754 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 17:24:36 +0530 Subject: [PATCH 09/17] Revert "Exclude log4j-slf4j-impl dependency" --- bvm/ballerina-core/build.gradle | 2 +- cli/ballerina-cli-module/build.gradle | 2 +- cli/ballerina-packerina/build.gradle | 2 +- gradle/balNativeLibProject.gradle | 2 +- langlib/langlib-test/build.gradle | 2 +- observelib/observe/build.gradle | 2 +- stdlib/auth/build.gradle | 2 +- stdlib/crypto/build.gradle | 2 +- stdlib/database/jdbc2/build.gradle | 2 +- stdlib/email/build.gradle | 2 +- stdlib/encoding/build.gradle | 2 +- stdlib/file/build.gradle | 2 +- stdlib/grpc/build.gradle | 2 +- stdlib/http/build.gradle | 2 +- stdlib/io/build.gradle | 2 +- stdlib/jdbc/build.gradle | 2 +- stdlib/jsonutils/build.gradle | 2 +- stdlib/jwt/build.gradle | 2 +- stdlib/ldap/build.gradle | 2 +- stdlib/math/build.gradle | 2 +- stdlib/messaging/kafka/build.gradle | 2 +- stdlib/messaging/nats/build.gradle | 2 +- stdlib/messaging/rabbitmq/build.gradle | 2 +- stdlib/mime/build.gradle | 2 +- stdlib/oauth2/build.gradle | 2 +- stdlib/socket/build.gradle | 2 +- stdlib/task/build.gradle | 2 +- stdlib/time/build.gradle | 2 +- stdlib/transactions/build.gradle | 2 +- stdlib/xmlutils/build.gradle | 2 +- tests/ballerina-compiler-plugin-test/build.gradle | 2 +- tests/ballerina-spec-conformance-tests/build.gradle | 2 +- tests/ballerina-test-utils/build.gradle | 2 +- tests/ballerina-tools-integration-test/build.gradle | 2 +- tests/jballerina-bstring-unit-test/build.gradle | 2 +- tests/jballerina-unit-test/build.gradle | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bvm/ballerina-core/build.gradle b/bvm/ballerina-core/build.gradle index ecea40ad2743..dc192b91e88c 100644 --- a/bvm/ballerina-core/build.gradle +++ b/bvm/ballerina-core/build.gradle @@ -63,7 +63,7 @@ configurations { exclude group: 'org.apache.servicemix.bundles', module: 'org.apache.servicemix.bundles.commons-beanutils' exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-log4j2' - exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + exclude group: 'org.slf4j', module: 'slf4j-log4j12' } } diff --git a/cli/ballerina-cli-module/build.gradle b/cli/ballerina-cli-module/build.gradle index 0f0c67fb1414..e16cfcc37c66 100644 --- a/cli/ballerina-cli-module/build.gradle +++ b/cli/ballerina-cli-module/build.gradle @@ -21,7 +21,7 @@ configurations { birJar bir birJarCompile { transitive false } - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/cli/ballerina-packerina/build.gradle b/cli/ballerina-packerina/build.gradle index d5fb71c20b2c..91119dc94033 100644 --- a/cli/ballerina-packerina/build.gradle +++ b/cli/ballerina-packerina/build.gradle @@ -21,7 +21,7 @@ configurations { birJar bir birJarCompile { transitive false } - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/gradle/balNativeLibProject.gradle b/gradle/balNativeLibProject.gradle index 01ad86771d5a..70b8386f1766 100644 --- a/gradle/balNativeLibProject.gradle +++ b/gradle/balNativeLibProject.gradle @@ -190,7 +190,7 @@ publishing { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/langlib/langlib-test/build.gradle b/langlib/langlib-test/build.gradle index f99a5f74aae7..fd6777897434 100644 --- a/langlib/langlib-test/build.gradle +++ b/langlib/langlib-test/build.gradle @@ -98,7 +98,7 @@ test { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/observelib/observe/build.gradle b/observelib/observe/build.gradle index 7b4d96708dc1..219ebd216a73 100644 --- a/observelib/observe/build.gradle +++ b/observelib/observe/build.gradle @@ -52,7 +52,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle index a80a747e03e7..da576a6082ed 100644 --- a/stdlib/auth/build.gradle +++ b/stdlib/auth/build.gradle @@ -83,7 +83,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle index ab13d208bfc9..d4f4931c17a5 100644 --- a/stdlib/crypto/build.gradle +++ b/stdlib/crypto/build.gradle @@ -55,7 +55,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/database/jdbc2/build.gradle b/stdlib/database/jdbc2/build.gradle index b7b0345e4444..6cbe1fe8b479 100644 --- a/stdlib/database/jdbc2/build.gradle +++ b/stdlib/database/jdbc2/build.gradle @@ -61,7 +61,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/email/build.gradle b/stdlib/email/build.gradle index 33c4e92ae77f..ae459c3b5940 100644 --- a/stdlib/email/build.gradle +++ b/stdlib/email/build.gradle @@ -77,7 +77,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/encoding/build.gradle b/stdlib/encoding/build.gradle index ab18aaa161a8..2a4e96c36da3 100644 --- a/stdlib/encoding/build.gradle +++ b/stdlib/encoding/build.gradle @@ -52,7 +52,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/file/build.gradle b/stdlib/file/build.gradle index 0f4aaf0b5a98..73a0819ce313 100644 --- a/stdlib/file/build.gradle +++ b/stdlib/file/build.gradle @@ -56,7 +56,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/grpc/build.gradle b/stdlib/grpc/build.gradle index ba90b25c7c43..8d67f6dcf4cd 100644 --- a/stdlib/grpc/build.gradle +++ b/stdlib/grpc/build.gradle @@ -29,7 +29,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/http/build.gradle b/stdlib/http/build.gradle index 1948dcaba3fa..25e61f05a077 100644 --- a/stdlib/http/build.gradle +++ b/stdlib/http/build.gradle @@ -114,7 +114,7 @@ createBalo { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/io/build.gradle b/stdlib/io/build.gradle index 7027dc95279d..2ffdea93aaaf 100644 --- a/stdlib/io/build.gradle +++ b/stdlib/io/build.gradle @@ -58,7 +58,7 @@ createBalo { description = 'Ballerina - I/O' configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jdbc/build.gradle b/stdlib/jdbc/build.gradle index 44bcbf0fa8d3..b5ed174cb88c 100644 --- a/stdlib/jdbc/build.gradle +++ b/stdlib/jdbc/build.gradle @@ -93,7 +93,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jsonutils/build.gradle b/stdlib/jsonutils/build.gradle index d316a26a0ed6..610cf813d71d 100644 --- a/stdlib/jsonutils/build.gradle +++ b/stdlib/jsonutils/build.gradle @@ -52,7 +52,7 @@ createBalo { description = 'Ballerina - Json Utils' configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/jwt/build.gradle b/stdlib/jwt/build.gradle index 0df8ec76e9d9..ff4d01964f82 100644 --- a/stdlib/jwt/build.gradle +++ b/stdlib/jwt/build.gradle @@ -93,7 +93,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/ldap/build.gradle b/stdlib/ldap/build.gradle index a7f3a371a95f..a34279c09a67 100644 --- a/stdlib/ldap/build.gradle +++ b/stdlib/ldap/build.gradle @@ -66,7 +66,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/math/build.gradle b/stdlib/math/build.gradle index 7b1af9692911..4c4e44428210 100644 --- a/stdlib/math/build.gradle +++ b/stdlib/math/build.gradle @@ -55,7 +55,7 @@ createBalo { description = 'Ballerina - Math' configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/kafka/build.gradle b/stdlib/messaging/kafka/build.gradle index 483fd8ebbf86..bc679a0d31ac 100644 --- a/stdlib/messaging/kafka/build.gradle +++ b/stdlib/messaging/kafka/build.gradle @@ -99,7 +99,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/nats/build.gradle b/stdlib/messaging/nats/build.gradle index 3e18cda07922..44ead2fa8585 100644 --- a/stdlib/messaging/nats/build.gradle +++ b/stdlib/messaging/nats/build.gradle @@ -30,7 +30,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/messaging/rabbitmq/build.gradle b/stdlib/messaging/rabbitmq/build.gradle index 7fe6312c3261..872673698400 100644 --- a/stdlib/messaging/rabbitmq/build.gradle +++ b/stdlib/messaging/rabbitmq/build.gradle @@ -60,7 +60,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/mime/build.gradle b/stdlib/mime/build.gradle index 3ecccbc06711..8c3e4feffb37 100644 --- a/stdlib/mime/build.gradle +++ b/stdlib/mime/build.gradle @@ -26,7 +26,7 @@ configurations.testCompileClasspath { configurations { tests - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/oauth2/build.gradle b/stdlib/oauth2/build.gradle index 5a0b718e084a..a08519bcf601 100644 --- a/stdlib/oauth2/build.gradle +++ b/stdlib/oauth2/build.gradle @@ -78,7 +78,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/socket/build.gradle b/stdlib/socket/build.gradle index c6c66201eb26..b6857e745c59 100644 --- a/stdlib/socket/build.gradle +++ b/stdlib/socket/build.gradle @@ -46,7 +46,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/task/build.gradle b/stdlib/task/build.gradle index 2309d8023ea8..00eb6803f3b3 100644 --- a/stdlib/task/build.gradle +++ b/stdlib/task/build.gradle @@ -25,7 +25,7 @@ configurations.testCompileClasspath { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/time/build.gradle b/stdlib/time/build.gradle index a938fb4eabb6..c1c62eddc791 100644 --- a/stdlib/time/build.gradle +++ b/stdlib/time/build.gradle @@ -50,7 +50,7 @@ createBalo { description = 'Ballerina - Time' configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/transactions/build.gradle b/stdlib/transactions/build.gradle index c8756d8c208b..d64ef927ac48 100644 --- a/stdlib/transactions/build.gradle +++ b/stdlib/transactions/build.gradle @@ -83,7 +83,7 @@ dependencies { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/stdlib/xmlutils/build.gradle b/stdlib/xmlutils/build.gradle index c0c4efa9ed6c..21163cfa3eb9 100644 --- a/stdlib/xmlutils/build.gradle +++ b/stdlib/xmlutils/build.gradle @@ -65,7 +65,7 @@ createBalo { description = 'Ballerina - Xmlutils' configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/ballerina-compiler-plugin-test/build.gradle b/tests/ballerina-compiler-plugin-test/build.gradle index 3e054e51fd8e..9a75ff744bb8 100644 --- a/tests/ballerina-compiler-plugin-test/build.gradle +++ b/tests/ballerina-compiler-plugin-test/build.gradle @@ -96,7 +96,7 @@ test { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/ballerina-spec-conformance-tests/build.gradle b/tests/ballerina-spec-conformance-tests/build.gradle index 7ccefe3c2b07..b80d10748ce7 100644 --- a/tests/ballerina-spec-conformance-tests/build.gradle +++ b/tests/ballerina-spec-conformance-tests/build.gradle @@ -54,7 +54,7 @@ test { } configurations { - testImplementation.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testImplementation.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testImplementation.exclude group: 'com.fasterxml.woodstox', module: 'woodstox-core' testImplementation.exclude group: 'org.codehaus.woodstox', module: 'stax2-api' } diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle index 6b1a758d704a..6fb43d3ccdff 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -65,7 +65,7 @@ shadowJar { exclude(dependency('org.ops4j.pax.logging:pax-logging-api')) exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi')) exclude(dependency('org.wso2.eclipse.osgi:org.eclipse.osgi.services')) - exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) + exclude(dependency('org.slf4j:slf4j-log4j12')) exclude(dependency('org.slf4j:slf4j-simple')) exclude(dependency('org.apache.logging.log4j:log4j-slf4j-impl')) exclude(dependency('io.netty:netty-common')) diff --git a/tests/ballerina-tools-integration-test/build.gradle b/tests/ballerina-tools-integration-test/build.gradle index 697240ba958f..9d0e814b175e 100644 --- a/tests/ballerina-tools-integration-test/build.gradle +++ b/tests/ballerina-tools-integration-test/build.gradle @@ -68,7 +68,7 @@ test { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' } diff --git a/tests/jballerina-bstring-unit-test/build.gradle b/tests/jballerina-bstring-unit-test/build.gradle index 9173f3ed5670..9c70ed049e9d 100644 --- a/tests/jballerina-bstring-unit-test/build.gradle +++ b/tests/jballerina-bstring-unit-test/build.gradle @@ -107,7 +107,7 @@ test { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } diff --git a/tests/jballerina-unit-test/build.gradle b/tests/jballerina-unit-test/build.gradle index aea648a99181..bc138cd41c8e 100644 --- a/tests/jballerina-unit-test/build.gradle +++ b/tests/jballerina-unit-test/build.gradle @@ -127,7 +127,7 @@ test { } configurations { - testCompile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } From c891b02c6db0dc519d7982de5d35198cab04148d Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 17:42:33 +0530 Subject: [PATCH 10/17] Add log4j-core and log4j-api --- bvm/ballerina-rt/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index 0369f2e52ba7..4f56541d2e77 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -74,6 +74,8 @@ dependencies { // Third party jars // config dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' + dist 'org.apache.logging.log4j:log4j-core:2.24.0' + dist 'org.apache.logging.log4j:log4j-api:2.24.0' dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' From ed648193235e78324726401a82917228379536d8 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 23:46:37 +0530 Subject: [PATCH 11/17] Change slf4j-api version --- bvm/ballerina-rt/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index 4f56541d2e77..af259163f8b3 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -76,7 +76,7 @@ dependencies { dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' dist 'org.apache.logging.log4j:log4j-core:2.24.0' dist 'org.apache.logging.log4j:log4j-api:2.24.0' - dist 'org.slf4j:slf4j-api:1.7.22' + dist 'org.slf4j:slf4j-api:2.0.16' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' dist 'org.apache.commons:commons-lang3:3.8.1' From 39dde727048598c805f140c557b4651d7da5c91b Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 15 Sep 2024 23:52:58 +0530 Subject: [PATCH 12/17] Add dependency and revert version of slf4j-api --- bvm/ballerina-rt/build.gradle | 2 +- misc/maven-resolver/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bvm/ballerina-rt/build.gradle b/bvm/ballerina-rt/build.gradle index af259163f8b3..4f56541d2e77 100644 --- a/bvm/ballerina-rt/build.gradle +++ b/bvm/ballerina-rt/build.gradle @@ -76,7 +76,7 @@ dependencies { dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0' dist 'org.apache.logging.log4j:log4j-core:2.24.0' dist 'org.apache.logging.log4j:log4j-api:2.24.0' - dist 'org.slf4j:slf4j-api:2.0.16' + dist 'org.slf4j:slf4j-api:1.7.22' dist 'com.moandjiezana.toml:toml4j:0.7.2' dist 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1' dist 'org.apache.commons:commons-lang3:3.8.1' diff --git a/misc/maven-resolver/build.gradle b/misc/maven-resolver/build.gradle index ff428ab069cc..71ad77837773 100644 --- a/misc/maven-resolver/build.gradle +++ b/misc/maven-resolver/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation 'org.apache.maven.resolver:maven-resolver-transport-http:1.7.3' implementation 'me.tongfei:progressbar' testCompile 'org.testng:testng' + testCompile 'org.apache.logging.log4j:log4j-slf4j-impl' } test { From a0bd4990e83dce5a31b6ea12a9462d54210fef37 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Mon, 16 Sep 2024 12:32:27 +0530 Subject: [PATCH 13/17] Update exclude statements --- .../modules/ballerina-to-openapi-generator/build.gradle | 6 ++++++ .../modules/openapi-to-ballerina-generator/build.gradle | 6 ++++++ tests/jballerina-integration-test/build.gradle | 3 +++ 3 files changed, 15 insertions(+) diff --git a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle index 7a011a42cc83..1d5758939e06 100644 --- a/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle +++ b/misc/openapi-ballerina/modules/ballerina-to-openapi-generator/build.gradle @@ -50,3 +50,9 @@ test { suites 'src/test/resources/testng.xml' } } + +configurations { + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' + testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' +} diff --git a/misc/openapi-ballerina/modules/openapi-to-ballerina-generator/build.gradle b/misc/openapi-ballerina/modules/openapi-to-ballerina-generator/build.gradle index 07f40c682692..020f77bac061 100644 --- a/misc/openapi-ballerina/modules/openapi-to-ballerina-generator/build.gradle +++ b/misc/openapi-ballerina/modules/openapi-to-ballerina-generator/build.gradle @@ -49,4 +49,10 @@ test { } } +configurations { + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' + testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' +} + description = 'Ballerina - OpenApi Tooling - OpenApi to Ballerina' diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 6ffed59f504c..5a71e8077c57 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -194,6 +194,9 @@ description = 'Ballerina - Integration Test' configurations.all { resolutionStrategy.preferProjectModules() + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' + testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } task copyToLib(type: Copy) { From b0e1f4ac3219447507eacb40e30cdb57cd29e469 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Mon, 16 Sep 2024 12:35:10 +0530 Subject: [PATCH 14/17] Remove exclude statement in integration tests --- tests/jballerina-integration-test/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 5a71e8077c57..6ffed59f504c 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -194,9 +194,6 @@ description = 'Ballerina - Integration Test' configurations.all { resolutionStrategy.preferProjectModules() - testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' - testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' - testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' } task copyToLib(type: Copy) { From 114936a447d019e908eaa7192572138589d3b5b0 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Mon, 16 Sep 2024 12:47:50 +0530 Subject: [PATCH 15/17] Add exclude statement to integration tests --- tests/jballerina-integration-test/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/jballerina-integration-test/build.gradle b/tests/jballerina-integration-test/build.gradle index 6ffed59f504c..a6673e192c36 100644 --- a/tests/jballerina-integration-test/build.gradle +++ b/tests/jballerina-integration-test/build.gradle @@ -192,6 +192,12 @@ clean.doFirst { description = 'Ballerina - Integration Test' +configurations { + testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple' + testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api' +} + configurations.all { resolutionStrategy.preferProjectModules() } From fe41521fe55dedc011680e8ca8b98afc8d1ac0df Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Mon, 16 Sep 2024 23:34:35 +0530 Subject: [PATCH 16/17] Add print statements to debug tests --- .../java/org/ballerinalang/test/logging/LogAPITestCase.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/logging/LogAPITestCase.java b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/logging/LogAPITestCase.java index f6950ffd3f1e..0911520e4aac 100644 --- a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/logging/LogAPITestCase.java +++ b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/logging/LogAPITestCase.java @@ -58,6 +58,7 @@ public void testBasicLogFunctionality() throws BallerinaTestException { String output = bMainInstance.runMainAndReadStdOut("run", new String[]{"mainmod"}, new HashMap<>(), projectDirPath, true); String[] logLines = output.split("\n"); + printLogLines(logLines); assertEquals(logLines.length, 13); validateLogLevel(logLines[9], "INFO", "[logorg/foo]", "Logging from inside `foo` module"); @@ -140,6 +141,7 @@ public void testDebugLevel() throws BallerinaTestException { String output = bMainInstance.runMainAndReadStdOut("run", args, new HashMap<>(), testFileLocation, true); String[] logLines = output.split("\n"); + printLogLines(logLines); assertEquals(logLines.length, 9); console.println(logLines[4]); @@ -165,6 +167,7 @@ public void testTraceLevel() throws BallerinaTestException { String output = bMainInstance.runMainAndReadStdOut("run", args, new HashMap<>(), testFileLocation, true); String[] logLines = output.split("\n"); + printLogLines(logLines); assertEquals(logLines.length, 10); console.println(logLines[4]); From 024f6f0692397406758e5ce5e5029eeda4053a7e Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Tue, 17 Sep 2024 14:16:54 +0530 Subject: [PATCH 17/17] Delete log4j2.xml config file --- .../zip/jballerina-tools/conf/log4j2.xml | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 distribution/zip/jballerina-tools/conf/log4j2.xml diff --git a/distribution/zip/jballerina-tools/conf/log4j2.xml b/distribution/zip/jballerina-tools/conf/log4j2.xml deleted file mode 100644 index cd6ecfd18e41..000000000000 --- a/distribution/zip/jballerina-tools/conf/log4j2.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -