ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 12:46:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-11657: Upgrade artemis. (#7707)

Browse Source 
* ENT-11657: Upgraded artemis.

* ENT-11657: Reverted dependencies task leftin.

* ENT-11657: Upgraded log4j and slf4j.
This commit is contained in:
Adel El-Beik 2024-04-03 11:15:00 +01:00 committed by GitHub
parent 72778b7fb0
commit 6c4b8fdf23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -453,7 +453,7 @@ allprojects {
substitute module('commons-logging:commons-logging') with module("org.slf4j:jcl-over-slf4j:$slf4j_version")
// Remove any transitive dependency on Logback (e.g. Liquibase 3.6 introduces this dependency)
substitute module('ch.qos.logback:logback-classic') with module("org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version")
substitute module('ch.qos.logback:logback-classic') with module("org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version")
// Netty-All is an uber-jar which contains every Netty module.
// Exclude it to force us to use the individual Netty modules instead.

6
constants.properties
View File

@ -45,7 +45,7 @@ commonsTextVersion=1.10.0
# We must configure it manually to use the latest capsule version.
capsuleVersion=1.0.4_r3
asmVersion=9.5
artemisVersion=2.29.0
artemisVersion=2.32.0
# TODO Upgrade Jackson only when corda is using kotlin 1.3.10
jacksonVersion=2.13.5
jacksonKotlinVersion=2.9.7
@ -53,8 +53,8 @@ jettyVersion=9.4.53.v20231009
jerseyVersion=2.25
servletVersion=4.0.1
assertjVersion=3.12.2
slf4JVersion=1.7.30
log4JVersion=2.23.0
slf4JVersion=2.0.12
log4JVersion=2.23.1
okhttpVersion=4.11.0
nettyVersion=4.1.77.Final
fileuploadVersion=1.4

2
experimental/blobwriter/build.gradle
View File

@ -10,7 +10,7 @@ dependencies {
implementation project(':serialization')
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
}
configurations.implementation.canBeResolved = true

2
experimental/netparams/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
implementation project(':tools:cliutils')
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
implementation "com.typesafe:config:$typesafe_config_version"
implementation "info.picocli:picocli:$picocli_version"

2
experimental/nodeinfo/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
implementation project(':tools:cliutils')
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
implementation "info.picocli:picocli:$picocli_version"
}

1
node-api/build.gradle
View File

@ -58,6 +58,7 @@ dependencies {
implementation "javax.persistence:javax.persistence-api:2.2"
implementation "org.hibernate:hibernate-core:$hibernate_version"
implementation "co.paralleluniverse:quasar-osgi-annotations:$quasar_version"
implementation "com.google.guava:guava:$guava_version"
runtimeOnly 'com.mattbertolini:liquibase-slf4j:2.0.0'

2
node/build.gradle
View File

@ -112,7 +112,7 @@ dependencies {
implementation project(':confidential-identities')
implementation "io.opentelemetry:opentelemetry-api:${open_telemetry_version}"
// Log4J: logging framework (with SLF4J bindings)
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

3
node/src/main/kotlin/net/corda/node/utilities/AppendOnlyPersistentMap.kt
View File

@ -1,7 +1,6 @@
package net.corda.node.utilities
import com.github.benmanes.caffeine.cache.LoadingCache
import net.corda.core.crypto.SecureHash
import net.corda.core.internal.NamedCacheFactory
import net.corda.core.utilities.contextLogger
import net.corda.nodeapi.internal.persistence.DatabaseTransaction
@ -248,7 +247,7 @@ abstract class AppendOnlyPersistentMapBase<K : Any, V, E, out EK>(
cache.invalidateAll()
}
fun clear(id: SecureHash) = cache.invalidate(id)
fun clear(id: K) = cache.invalidate(id)
// Helpers to know if transaction(s) are currently writing the given key.
private fun weAreWriting(key: K): Boolean = pendingKeys[key]?.transactions?.contains(contextTransaction) ?: false

2
samples/attachment-demo/build.gradle
View File

@ -54,7 +54,7 @@ dependencies {
testImplementation(project(':node-driver')) {
// We already have a SLF4J implementation on our runtime classpath,
// and we don't need another one.
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j2-impl'
}
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"

2
samples/irs-demo/web/build.gradle
View File

@ -12,7 +12,7 @@ group = "${parent.group}.irs-demo"
dependencyManagement {
dependencies {
dependency "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
dependency "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
dependency "org.apache.logging.log4j:log4j-core:$log4j_version"
dependency "org.apache.logging.log4j:log4j-api:$log4j_version"
}

2
samples/trader-demo/build.gradle
View File

@ -56,7 +56,7 @@ dependencies {
testImplementation(project(':node-driver')) {
// We already have a SLF4J implementation on our runtime classpath,
// and we don't need another one.
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j2-impl'
}
testImplementation "io.reactivex:rxjava:$rxjava_version"

2
testing/test-db/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
testImplementation "org.assertj:assertj-core:$assertj_version"
testImplementation "org.slf4j:slf4j-api:$slf4j_version"
testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
}
jar {

2
testing/testserver/build.gradle
View File

@ -37,7 +37,7 @@ dependencies {
implementation "commons-fileupload:commons-fileupload:$fileupload_version"
// Log4J: logging framework (with SLF4J bindings)
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-core:$log4j_version"
// JOpt: for command line flags.

2
tools/blobinspector/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
implementation project(":common-logging")
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"

4
tools/bootstrapper/build.gradle
View File

@ -11,12 +11,12 @@ dependencies {
implementation project(':common-configuration-parsing')
implementation project(':common-validation')
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "com.typesafe:config:$typesafe_config_version"
implementation "info.picocli:picocli:$picocli_version"
testImplementation(project(':test-utils')) {
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j2-impl'
}
testImplementation(project(':core-test-utils'))

2
tools/demobench/build.gradle
View File

@ -72,7 +72,7 @@ dependencies {
implementation "org.slf4j:log4j-over-slf4j:$slf4j_version"
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-core:$log4j_version"
implementation "com.typesafe:config:$typesafe_config_version"

2
tools/error-tool/build.gradle
View File

@ -5,7 +5,7 @@ dependencies {
implementation project(":common-logging")
implementation project(":tools:cliutils")
implementation "info.picocli:picocli:$picocli_version"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
testImplementation "junit:junit:$junit_version"
testImplementation "org.assertj:assertj-core:$assertj_version"

2
tools/explorer/build.gradle
View File

@ -39,7 +39,7 @@ dependencies {
implementation project(':common-logging')
// Log4J: logging framework (with SLF4J bindings)
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
// Capsule is a library for building independently executable fat JARs.
// We only need this dependency to implementation our Caplet against.

2
verifier/build.gradle
View File

@ -14,5 +14,5 @@ dependencies {
implementation "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
}