Skip to content

Commit

Permalink
CORE-15310: Rename bundles/libraries (#6249)
Browse files Browse the repository at this point in the history
`net.corda.slf4jv1` -> `net.corda.testing.slf4jv1`
`org.slf4j:slf4j-api` -> `libs.slf4j.api`
  • Loading branch information
vkolomeyko authored Jul 3, 2024
1 parent a4fe8e2 commit cecd713
Show file tree
Hide file tree
Showing 61 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion applications/examples/sandbox-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
implementation 'net.corda:corda-base'
implementation 'net.corda:corda-application'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

implementation project(':testing:sandboxes')
implementation project(':libs:configuration:configuration-core')
Expand Down
2 changes: 1 addition & 1 deletion applications/examples/sandbox-app/example-cpi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ dependencies {
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-crypto-extensions'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api
implementation libs.jackson.annotations
}
2 changes: 1 addition & 1 deletion applications/tools/p2p-test/app-simulator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation "net.corda:corda-topic-schema:$cordaApiVersion"
implementation libs.typesafe.config
implementation "info.picocli:picocli:$picocliVersion"
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api
implementation "net.corda:corda-base"
implementation project(":components:kafka-topic-admin")
implementation project(":libs:configuration:configuration-core")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ dependencies {
implementation 'net.corda:corda-db-schema'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}
2 changes: 1 addition & 1 deletion components/ledger/ledger-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
implementation 'net.corda:corda-ledger-utxo'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation "org.hibernate:hibernate-core:$hibernateVersion"

testImplementation project(':testing:db-testkit')
Expand Down
2 changes: 1 addition & 1 deletion components/ledger/ledger-verification/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
implementation 'net.corda:corda-ledger-utxo'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

implementation project(':components:virtual-node:cpk-read-service')
implementation project(':components:virtual-node:sandbox-group-context-service')
Expand Down
2 changes: 1 addition & 1 deletion components/ledger/ledger-verification/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
bnd.identity;id='net.bytebuddy.byte-buddy',\
bnd.identity;id='junit-jupiter-engine',\
bnd.identity;id='junit-platform-launcher',\
bnd.identity;id='net.corda.slf4jv1',\
bnd.identity;id='net.corda.testing.slf4jv1',\
bnd.identity;id='slf4j.simple',\
bnd.identity;id='org.liquibase.core',\
bnd.identity;id='com.opencsv',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
implementation "net.corda:corda-membership"
implementation "net.corda:corda-topic-schema"
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api

runtimeOnly project(":libs:web:web-impl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ dependencies {
implementation 'net.corda:corda-base'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
implementation 'net.corda:corda-db-schema'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

testImplementation project(':testing:db-testkit')
testImplementation project(':testing:persistence-testkit')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
bnd.identity;id='net.corda.test-impl-two',\
bnd.identity;id='junit-jupiter-engine',\
bnd.identity;id='junit-platform-launcher',\
bnd.identity;id='net.corda.slf4jv1',\
bnd.identity;id='net.corda.testing.slf4jv1',\
bnd.identity;id='slf4j.simple'

-runstartlevel: \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
implementation 'net.corda:corda-membership'
implementation 'net.corda:corda-topic-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

testImplementation project(":libs:crypto:crypto-impl")
testImplementation project(":testing:test-utilities")
Expand Down
2 changes: 1 addition & 1 deletion libs/application/addon/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
compileOnly "org.osgi:org.osgi.service.component:$osgiServiceComponentVersion"

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

implementation platform("net.corda:corda-api:$cordaApiVersion")
}
2 changes: 1 addition & 1 deletion libs/application/application-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation libs.jackson.module.kotlin
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation libs.jackson.datatype.jsr310

testImplementation "com.google.jimfs:jimfs:$jimfsVersion"
Expand Down
2 changes: 1 addition & 1 deletion libs/application/banner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}
2 changes: 1 addition & 1 deletion libs/cache/cache-caffeine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation 'net.corda:corda-base'
api libs.caffeine
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

testImplementation "com.google.jimfs:jimfs:$jimfsVersion"
}
2 changes: 1 addition & 1 deletion libs/chunking/chunking-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation "net.corda:corda-avro-schema"
implementation "net.corda:corda-config-schema"
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
api "net.corda:corda-crypto"

implementation project(":libs:configuration:configuration-core")
Expand Down
2 changes: 1 addition & 1 deletion libs/configuration/configuration-merger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ dependencies {
implementation project(':libs:messaging:message-bus')
implementation libs.typesafe.config
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

}
2 changes: 1 addition & 1 deletion libs/crypto/cipher-suite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly "co.paralleluniverse:quasar-osgi-annotations:$quasarVersion"

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation project(":libs:crypto:crypto-utils")

api platform("net.corda:corda-api:$cordaApiVersion")
Expand Down
2 changes: 1 addition & 1 deletion libs/db/db-admin-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation "net.corda:corda-base"
compileOnly "org.osgi:osgi.annotation"
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api
compileOnly "org.osgi:org.osgi.service.component.annotations"
// Commons IO is needed in liquibase which causes OSGi enabled liquibase tests to fail unless it is imported
implementation libs.commonsio
Expand Down
2 changes: 1 addition & 1 deletion libs/db/db-orm-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation "net.corda:corda-base"
compileOnly "org.osgi:osgi.annotation"
compileOnly 'org.osgi:org.osgi.service.component.annotations'
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api
api "javax.persistence:javax.persistence-api"

runtimeOnly("org.hibernate:hibernate-core:$hibernateVersion")
Expand Down
2 changes: 1 addition & 1 deletion libs/kotlin-heap-fix/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
compileOnly 'org.osgi:osgi.annotation'
compileOnly 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}

processResources {
Expand Down
2 changes: 1 addition & 1 deletion libs/lifecycle/lifecycle-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation libs.guava
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'net.corda:corda-base'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

testImplementation project(":testing:test-utilities")
testImplementation project(":libs:lifecycle:lifecycle-test-impl")
Expand Down
2 changes: 1 addition & 1 deletion libs/lifecycle/lifecycle-test-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies {
implementation libs.mockito.core
implementation libs.mockito.kotlin
implementation 'net.corda:corda-base'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}
2 changes: 1 addition & 1 deletion libs/lifecycle/lifecycle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'net.corda:corda-base'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

}
2 changes: 1 addition & 1 deletion libs/lifecycle/registry/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'net.corda:corda-base'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation project(":libs:lifecycle:lifecycle")

}
2 changes: 1 addition & 1 deletion libs/metrics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
compileOnly "co.paralleluniverse:quasar-osgi-annotations:$quasarVersion"

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation libs.micrometer.registry.prometheus

api(libs.micrometer.core) {
Expand Down
2 changes: 1 addition & 1 deletion libs/rest/rest-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies {

api project(':libs:rest:rest-security-read')

implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}
2 changes: 1 addition & 1 deletion libs/sandbox-internal/sandbox-cpk-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ dependencies {
compileOnly "org.osgi:osgi.annotation"
compileOnly "org.osgi:org.osgi.service.component.annotations"
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api
}
2 changes: 1 addition & 1 deletion libs/sandbox-internal/sandbox-cpk-one/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.osgi:osgi.core'
cordaProvided 'net.corda:corda-application'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api
// We use version 2.10.10 here, and version 2.10.9 in CPK Two, to show that multiple versions of a library can
// co-exist in a sandbox group.
implementation 'joda-time:joda-time:2.10.10'
Expand Down
2 changes: 1 addition & 1 deletion libs/sandbox-internal/sandbox-cpk-three/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies {
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.osgi:osgi.core'
cordaProvided 'net.corda:corda-application'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api
}
2 changes: 1 addition & 1 deletion libs/sandbox-internal/sandbox-cpk-two/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.osgi:osgi.core'
cordaProvided 'net.corda:corda-application'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api
// We use version 2.10.9 here, and version 2.10.10 in CPK One, to show that multiple versions of a library can
// co-exist in a sandbox group.
implementation 'joda-time:joda-time:2.10.9'
Expand Down
2 changes: 1 addition & 1 deletion libs/sandbox-internal/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
bnd.identity;id='co.paralleluniverse.quasar-core',\
bnd.identity;id='junit-jupiter-engine',\
bnd.identity;id='junit-platform-launcher',\
bnd.identity;id='net.corda.slf4jv1',\
bnd.identity;id='net.corda.testing.slf4jv1',\
bnd.identity;id='slf4j.simple'

-runstartlevel: \
Expand Down
2 changes: 1 addition & 1 deletion libs/serialization/serialization-amqp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation libs.guava
implementation "org.apache.qpid:proton-j:$protonjVersion"
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api

testImplementation project(':libs:crypto:cipher-suite')
testImplementation project(':libs:crypto:cipher-suite-impl')
Expand Down
2 changes: 1 addition & 1 deletion libs/serialization/serialization-encoding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {

implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
}

def jar = tasks.named('jar', Jar) {
Expand Down
2 changes: 1 addition & 1 deletion libs/serialization/serialization-kryo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
implementation "com.esotericsoftware:kryo:$kryoVersion"
implementation project(path: ':libs:serialization:kryo-serializers', configuration: 'bundle')
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation "org.slf4j:slf4j-api"
implementation libs.slf4j.api

implementation project(":libs:sandbox")
implementation project(":libs:serialization:serialization-checkpoint-api")
Expand Down
2 changes: 1 addition & 1 deletion libs/utilities/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
implementation 'net.corda:corda-config-schema'
implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
// Concluded this is the one acceptable dependency in addition to kotlin.
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation libs.bouncycastle.pkix
implementation libs.snappy.java

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

cordapp project(":notary-plugins:notary-plugin-common")
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

// Common package pulled in as transitive dependency through API
cordapp project(":notary-plugins:notary-plugin-contract-verifying:notary-plugin-contract-verifying-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

// Common package pulled in as transitive dependency through API
cordapp project(":notary-plugins:notary-plugin-contract-verifying:notary-plugin-contract-verifying-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

cordapp project(":notary-plugins:notary-plugin-common")
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

// Common package pulled in as transitive dependency through API
cordapp project(":notary-plugins:notary-plugin-non-validating:notary-plugin-non-validating-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
cordaProvided 'net.corda:corda-application'
cordaProvided 'net.corda:corda-notary-plugin'
cordaProvided 'org.jetbrains.kotlin:kotlin-osgi-bundle'
cordaProvided 'org.slf4j:slf4j-api'
cordaProvided libs.slf4j.api

// Common package pulled in as transitive dependency through API
cordapp project(":notary-plugins:notary-plugin-non-validating:notary-plugin-non-validating-api")
Expand Down
2 changes: 1 addition & 1 deletion osgi-framework-bootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
compileOnly 'org.osgi:osgi.core'
implementation platform("net.corda:corda-api:$cordaApiVersion")
implementation project(':osgi-framework-api')
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation libs.slf4j.jul
runtimeOnly "org.apache.felix:org.apache.felix.framework:$felixVersion"
runtimeOnly libs.log4j.slf4j
Expand Down
2 changes: 1 addition & 1 deletion processors/flow-mapper-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation 'net.corda:corda-base'
implementation 'net.corda:corda-ledger-utxo'
implementation 'net.corda:corda-notary-plugin'
Expand Down
2 changes: 1 addition & 1 deletion processors/flow-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation platform("net.corda:corda-api:$cordaApiVersion")

implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
implementation 'org.slf4j:slf4j-api'
implementation libs.slf4j.api
implementation 'net.corda:corda-base'
implementation 'net.corda:corda-ledger-utxo'
implementation 'net.corda:corda-notary-plugin'
Expand Down
Loading

0 comments on commit cecd713

Please sign in to comment.