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.

Sign up for GitHub

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

CORE-16786: Upgrade CLI PF4J to 3.10 and SLF4J to 2.0.6 #4722

Merged
merged 4 commits into from
Sep 29, 2023
Merged

CORE-16786: Upgrade CLI PF4J to 3.10 and SLF4J to 2.0.6 #4722

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05e7b37
CORE-15310: Upgrade CLI PF4J to 3.10 and SLF4J to 2.0.6
josephzunigadaly Sep 27, 2023
aa36735
CORE-15310: Swap log4j-slf4j-impl for log4j-slf4j2-impl in CLI test
josephzunigadaly Sep 28, 2023
e85f0f7
CORE-15310: Use SLF4J 1 in E2E test utilities
josephzunigadaly Sep 28, 2023
4b10351
CORE-16786: Explain CLI uses SLF4J 2 in gradle.properties
josephzunigadaly Sep 29, 2023
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
3 changes: 2 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ quasarVersion = 0.9.1_r3-SNAPSHOT
reflectAsmVersion = 1.11.9
# SLF4J cannot be ugraded to 2.x due to CorDapps requiring the 1.7 <= x < 2.0
slf4jVersion=1.7.36
slf4jV2Version=2.0.6
# Snappy version used for serialization
snappyVersion=0.4
# Completely different version of Snappy used in Kafka client
Expand Down Expand Up @@ -136,7 +137,7 @@ jibCoreVersion=0.23.0
artifactoryPluginVersion = 4.28.2

# PF4J
pf4jVersion=3.9.0
pf4jVersion=3.10.0

# corda-cli plugin host
pluginHostVersion=5.1.0-beta+
Expand Down
8 changes: 8 additions & 0 deletions testing/e2e-test-utilities/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ plugins {
description 'E2E test utilities'

dependencies {
constraints {
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jVersion
}
}
}

implementation "net.corda:corda-config-schema:$cordaApiVersion"

implementation "com.konghq:unirest-java:$unirestVersion"
Expand Down
5 changes: 5 additions & 0 deletions tools/plugins/db-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ dependencies {
implementation("org.yaml:snakeyaml:$snakeyamlVersion") {
because "required until liquibase-core updates it's internal version of snakeYaml, currently using 1.33 which has CVE-2022-1471"
}
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jV2Version
}
}
}

// DO NOT DISTRIBUTE DRIVERS HERE WE ARE NOT LICENSED TO DISTRIBUTE
Expand Down
8 changes: 8 additions & 0 deletions tools/plugins/network/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ ext {
group 'net.corda.cli.deployment'

dependencies {
constraints {
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jV2Version
}
}
}

compileOnly "net.corda.cli.host:api:$pluginHostVersion"

implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
Expand Down
10 changes: 9 additions & 1 deletion tools/plugins/package/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ ext {
group 'net.corda.cli.deployment'

dependencies {
constraints {
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jV2Version
}
}
}

compileOnly "net.corda.cli.host:api:$pluginHostVersion"

implementation project(':libs:packaging:packaging-verify')
Expand All @@ -27,7 +35,7 @@ dependencies {
testImplementation project(":testing:test-utilities")
testImplementation project(":testing:packaging-test-utilities")

testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion"
}

cliPlugin {
Expand Down
5 changes: 5 additions & 0 deletions tools/plugins/topic-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ dependencies {
because 'Kafka Client uses an older version of Snappy library which is exposed to CVE-2023-34455. ' +
'This might be resolved in the future versions of Kafka Client.'
}
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jV2Version
}
}
}

testImplementation 'org.jetbrains.kotlin:kotlin-stdlib'
Expand Down
5 changes: 5 additions & 0 deletions tools/plugins/virtual-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ dependencies {
implementation("org.yaml:snakeyaml:$snakeyamlVersion") {
because "required until liquibase-core updates it's internal version of snakeYaml, currently using 1.33 which has CVE-2022-1471"
}
implementation('org.slf4j:slf4j-api') {
version {
strictly slf4jV2Version
}
}
}

// DO NOT DISTRIBUTE DRIVERS HERE WE ARE NOT LICENSED TO DISTRIBUTE
Expand Down