ENT-11657: Upgrade artemis. (#7707)

* ENT-11657: Upgraded artemis.

* ENT-11657: Reverted dependencies task leftin.

* ENT-11657: Upgraded log4j and slf4j.

build.gradle

@@ -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.

constants.properties

@@ -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
+slf4JVersion=2.0.12
-log4JVersion=2.23.0
+log4JVersion=2.23.1
 okhttpVersion=4.11.0
 nettyVersion=4.1.77.Final
 fileuploadVersion=1.4

experimental/blobwriter/build.gradle

@@ -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

experimental/netparams/build.gradle

@@ -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"

experimental/nodeinfo/build.gradle

@@ -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"
 }

node-api/build.gradle

@@ -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'
 

node/build.gradle

@@ -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"

node/src/main/kotlin/net/corda/node/utilities/AppendOnlyPersistentMap.kt

@@ -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

samples/attachment-demo/build.gradle

@@ -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}"

samples/irs-demo/web/build.gradle

@@ -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"
     }

samples/trader-demo/build.gradle

@@ -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"

testing/test-db/build.gradle

@@ -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 {

testing/testserver/build.gradle

@@ -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.

tools/blobinspector/build.gradle

@@ -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"

tools/bootstrapper/build.gradle

@@ -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'))

tools/demobench/build.gradle

@@ -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"
 

tools/error-tool/build.gradle

@@ -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"

tools/explorer/build.gradle

@@ -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.

verifier/build.gradle

@@ -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"
 }