Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Change slf4j-jdk14 to log4j-slf4j-impl #43390

Closed
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bvm/ballerina-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
4 changes: 2 additions & 2 deletions bvm/ballerina-rt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ dependencies {

// Third party jars
// config
dist 'org.slf4j:slf4j-jdk14:1.7.22'
dist 'org.slf4j:slf4j-api:1.7.22'
dist 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.4'
ravinperera00 marked this conversation as resolved.
Show resolved Hide resolved
dist 'org.apache.logging.log4j:log4j-1.2-api:2.2'
ravinperera00 marked this conversation as resolved.
Show resolved Hide resolved
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'
Expand Down
3 changes: 1 addition & 2 deletions gradle/javaProject.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ 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.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'
Expand Down
2 changes: 1 addition & 1 deletion langlib/langlib-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion language-server/modules/langserver-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion misc/docerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion misc/testerina/modules/testerina-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion observelib/observe/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/bir-old/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion stdlib/bir/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion stdlib/cache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/config-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion stdlib/crypto/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/database/jdbc2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/email/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion stdlib/encoding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/file/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/filepath/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/io/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion stdlib/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion stdlib/jsonutils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion stdlib/math/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/runtime-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/socket/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/task/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/time/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion stdlib/xmlutils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ballerina-compiler-plugin-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/ballerina-spec-conformance-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/ballerina-test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
2 changes: 1 addition & 1 deletion tests/ballerina-tools-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tests/jballerina-debugger-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/jballerina-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tests/jballerina-unit-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tests/openapi-integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/testerina-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading