Merge pull request #6899 from corda/aga/make-recordDependencies-suspendable-4.6

NOTICK - forward merge from OS 4.5 (2021-04-21)

core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt

@@ -30,5 +30,6 @@ interface TransactionsResolver {
     @Suspendable
     fun downloadDependencies(batchMode: Boolean)
 
+    @Suspendable
     fun recordDependencies(usedStatesToRecord: StatesToRecord)
 }

docs/build.gradle

@@ -43,13 +43,13 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
         includes = ['packages.md']
         jdkVersion = 8
         externalDocumentationLink {
-            url = new URL("http://fasterxml.github.io/jackson-core/javadoc/2.9/")
+            url = new URL("https://fasterxml.github.io/jackson-core/javadoc/2.9/")
         }
         externalDocumentationLink {
             url = new URL("https://docs.oracle.com/javafx/2/api/")
         }
         externalDocumentationLink {
-            url = new URL("http://www.bouncycastle.org/docs/docs1.5on/")
+            url = new URL("https://www.bouncycastle.org/docs/docs1.5on/")
         }
         internalPackagePrefixes.collect { packagePrefix ->
             packageOptions {

node/src/main/kotlin/net/corda/node/services/DbTransactionsResolver.kt

@@ -94,6 +94,7 @@ class DbTransactionsResolver(private val flow: ResolveTransactionsFlow) : Transa
         logger.debug { "Downloaded ${sortedDependencies?.size} dependencies from remote peer for transactions ${flow.txHashes}" }
     }
 
+    @Suspendable
     override fun recordDependencies(usedStatesToRecord: StatesToRecord) {
         val sortedDependencies = checkNotNull(this.sortedDependencies)
         logger.trace { "Recording ${sortedDependencies.size} dependencies for ${flow.txHashes.size} transactions" }