Revert "Exclude log4j-slf4j-impl dependency"

ballerina-platform · Sep 15, 2024 · 5d5cb88 · 5d5cb88
1 parent c320046
commit 5d5cb88
Show file tree

Hide file tree

Showing 36 changed files with 36 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
 }