diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 44edc26bf9..0ee16ed651 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -396,7 +396,7 @@ pipeline {
}
unstable {
script {
- sendSlackNotifications("warning", "BUILD UNSTABLE - Unstable Builds are likely a result of Nexus Sonar Scanner violations", false, "#corda-corda4-open-source-build-notifications")
+ sendSlackNotifications("warning", "BUILD UNSTABLE - Unstable Builds are likely a result of Nexus Sonar Scanner violations", false, "#corda-corda4-open-source-build-notifications")
}
}
failure {
diff --git a/build.gradle b/build.gradle
index 7bd87e42aa..d9a2c54917 100644
--- a/build.gradle
+++ b/build.gradle
@@ -373,6 +373,12 @@ allprojects {
repositories {
mavenLocal()
+ // Prevents cache giving use the wrong artemis
+ mavenCentral {
+ content {
+ includeGroup 'org.apache.activemq'
+ }
+ }
// Use system environment to activate caching with Artifactory,
// because it is actually easier to pass that during parallel build.
// NOTE: it has to be a name of a virtual repository with all
diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml
index 171832c040..fda43c56e6 100644
--- a/config/dev/log4j2.xml
+++ b/config/dev/log4j2.xml
@@ -202,7 +202,11 @@
-
+
+
+
+
+
diff --git a/constants.properties b/constants.properties
index 94737aacd9..0e67ddd2c3 100644
--- a/constants.properties
+++ b/constants.properties
@@ -27,7 +27,7 @@ typesafeConfigVersion=1.3.4
jsr305Version=3.0.2
artifactoryPluginVersion=4.16.1
snakeYamlVersion=1.19
-caffeineVersion=2.7.0
+caffeineVersion=2.9.3
metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1
djvmVersion=1.1.1
diff --git a/docker/src/docker/Dockerfile b/docker/src/docker/Dockerfile
index 84200d542b..b87898e1d2 100644
--- a/docker/src/docker/Dockerfile
+++ b/docker/src/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:8u312
+FROM azul/zulu-openjdk:8u322
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN apt-get update && \
diff --git a/docker/src/docker/Dockerfile-debug b/docker/src/docker/Dockerfile-debug
index a1175c989c..6f69c0b2d5 100644
--- a/docker/src/docker/Dockerfile-debug
+++ b/docker/src/docker/Dockerfile-debug
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:8u312
+FROM azul/zulu-openjdk:8u322
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN apt-get update && \
diff --git a/docker/src/docker/DockerfileAL b/docker/src/docker/DockerfileAL
index 8c5ccd46ff..eee206714b 100644
--- a/docker/src/docker/DockerfileAL
+++ b/docker/src/docker/DockerfileAL
@@ -1,4 +1,4 @@
-FROM amazoncorretto:8u312-al2
+FROM amazoncorretto:8u322-al2
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN yum -y install bash && \
diff --git a/node/build.gradle b/node/build.gradle
index 0b4a47213d..3e247a5ed5 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -206,7 +206,6 @@ dependencies {
// BFT-Smart dependencies
compile 'com.github.bft-smart:library:master-v1.1-beta-g6215ec8-87'
- compile 'commons-codec:commons-codec:1.13'
// Java Atomix: RAFT library
compile 'io.atomix.copycat:copycat-client:1.2.3'
diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
index 311cb5b164..2d314e9c3b 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
@@ -104,17 +104,6 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging,
* Flows should be removed from [flowsInHospital] when they have completed a successful transition.
*/
private val flowsInHospital = ConcurrentHashMap()
-
- /**
- * Returns true if the flow is currently being treated in the hospital.
- * The differs to flows with a medical history (which can accessed via [StaffedFlowHospital.contains]).
- */
- @VisibleForTesting
- internal fun flowInHospital(runId: StateMachineRunId): Boolean {
- // The .keys avoids https://youtrack.jetbrains.com/issue/KT-18053
- return runId in flowsInHospital.keys
- }
-
private val mutex = ThreadBox(object {
/**
* Contains medical history of every flow (a patient) that has entered the hospital. A flow can leave the hospital,
@@ -348,7 +337,7 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging,
}
}
- operator fun contains(flowId: StateMachineRunId) = mutex.locked { flowId in flowPatients }
+ operator fun contains(flowId: StateMachineRunId) = flowId in flowsInHospital.keys
override fun close() {
hospitalJobTimer.cancel()
diff --git a/testing/test-common/src/main/resources/log4j2-test.xml b/testing/test-common/src/main/resources/log4j2-test.xml
index 5edab5035f..f6a24d2f5b 100644
--- a/testing/test-common/src/main/resources/log4j2-test.xml
+++ b/testing/test-common/src/main/resources/log4j2-test.xml
@@ -90,7 +90,11 @@
-
+
+
+
+
+