Merge pull request #7354 from corda/cc/merge/os-4.9-os-4.10/27-apr-2023

ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates

build.gradle

@@ -124,6 +124,7 @@ buildscript {
     ext.docker_java_version = constants.getProperty("dockerJavaVersion")
     ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version")
     ext.commons_text_version = constants.getProperty("commonsTextVersion")
+    ext.snake_yaml_version = constants.getProperty("snakeYamlVersion")
     if (JavaVersion.current().isJava8()) {
         ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsJava8Version")
         ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeJava8Version")
@@ -464,6 +465,9 @@ allprojects {
                             details.useVersion commons_text_version
                         }
                     }
+                    if (details.requested.group == 'org.yaml' && details.requested.name == 'snakeyaml') {
+                        details.useVersion snake_yaml_version
+                    }
                 }
 
                 dependencySubstitution {

constants.properties

@@ -30,6 +30,7 @@ disruptorVersion=3.4.2
 typesafeConfigVersion=1.3.4
 jsr305Version=3.0.2
 artifactoryPluginVersion=4.16.1
+snakeYamlVersion=1.33
 caffeineVersion=2.9.3
 metricsVersion=4.1.0
 metricsNewRelicVersion=1.1.1
@@ -51,7 +52,7 @@ capsuleVersion=1.0.3
 asmVersion=7.1
 artemisVersion=2.19.1
 # TODO Upgrade Jackson only when corda is using kotlin 1.3.10
-jacksonVersion=2.13.3
+jacksonVersion=2.13.5
 jacksonKotlinVersion=2.9.7
 jettyVersion=9.4.19.v20190610
 jerseyVersion=2.25

node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt

@@ -8,6 +8,7 @@ import net.corda.core.flows.*
 import net.corda.core.identity.Party
 import net.corda.core.internal.concurrent.transpose
 import net.corda.core.messaging.startFlow
+import net.corda.core.node.services.StatesNotAvailableException
 import net.corda.core.node.services.queryBy
 import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.transactions.TransactionBuilder
@@ -70,7 +71,11 @@ class ScheduledFlowIntegrationTests {
             val state = results.states.firstOrNull() ?: return
             require(!state.state.data.processed) { "Cannot spend an already processed state" }
             val lock = UUID.randomUUID()
-            serviceHub.vaultService.softLockReserve(lock, NonEmptySet.of(state.ref))
+            try {
+                serviceHub.vaultService.softLockReserve(lock, NonEmptySet.of(state.ref))
+            } catch (e: StatesNotAvailableException) {
+                return
+            }
             val notary = state.state.notary
             val outputState = SpentState(identity, ourIdentity, state.state.data.destination)
             val builder = TransactionBuilder(notary)

node/src/integration-test/kotlin/net/corda/testMessage/ScheduledState.kt

@@ -4,6 +4,7 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.*
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
+import net.corda.core.node.services.StatesNotAvailableException
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.NonEmptySet
 import net.corda.testing.contracts.DummyContract
@@ -25,7 +26,11 @@ class ScheduledFlow(private val stateRef: StateRef) : FlowLogic<Unit>() {
         }
         require(!scheduledState.processed) { "State should not have been previously processed" }
         val lock = UUID.randomUUID()
-        serviceHub.vaultService.softLockReserve(lock, NonEmptySet.of(state.ref))
+        try {
+            serviceHub.vaultService.softLockReserve(lock, NonEmptySet.of(state.ref))
+        } catch (e: StatesNotAvailableException) {
+            return
+        }
         val notary = state.state.notary
         val newStateOutput = scheduledState.copy(processed = true)
         val builder = TransactionBuilder(notary)

settings.gradle

@@ -81,10 +81,10 @@ include 'tools:checkpoint-agent'
 include 'samples:attachment-demo:contracts'
 include 'samples:attachment-demo:workflows'
 include 'samples:trader-demo:workflows-trader'
-include 'samples:irs-demo'
-include 'samples:irs-demo:cordapp:contracts-irs'
-include 'samples:irs-demo:cordapp:workflows-irs'
-include 'samples:irs-demo:web'
+// include 'samples:irs-demo'
+// include 'samples:irs-demo:cordapp:contracts-irs'
+// include 'samples:irs-demo:cordapp:workflows-irs'
+// include 'samples:irs-demo:web'
 include 'samples:simm-valuation-demo'
 include 'samples:simm-valuation-demo:flows'
 include 'samples:simm-valuation-demo:contracts-states'