Merge branch 'release/os/5.2' into mbrkic-r3/CORE-18320/flow-timeout

build.gradle

@@ -13,9 +13,9 @@ buildscript {
 
 plugins {
     id 'net.corda.cordapp.cordapp-configuration'
-    id 'org.jetbrains.kotlin.jvm' apply false
-    id 'org.jetbrains.kotlin.plugin.allopen' apply false
-    id 'org.jetbrains.kotlin.plugin.jpa' apply false
+    alias libs.plugins.kotlin.jvm apply false
+    alias libs.plugins.kotlin.allopen apply false
+    alias libs.plugins.kotlin.jpa apply false
     alias libs.plugins.detekt apply false
     alias libs.plugins.snyk
     alias libs.plugins.grgit // used for GIT interaction (e.g. extract commit hash)
@@ -52,11 +52,11 @@ def revision = {
 void configureKotlinForOSGi(Configuration configuration) {
     configuration.resolutionStrategy {
         dependencySubstitution {
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
         }
     }
 }

corda-api/build.gradle

@@ -27,11 +27,7 @@ dependencies {
         api project(':serialization')
 
         api(libs.javax.persistence.api)
-        api('org.jetbrains.kotlin:kotlin-osgi-bundle') {
-            version {
-                    require kotlinVersion
-            }
-        }
+        api(libs.kotlin.osgi.bundle)
         api('org.jetbrains:annotations') {
             version {
                 require jetbrainsAnnotationsVersion

data/avro-schema/src/main/resources/avro/net/corda/data/p2p/gateway/GatewayResponse.avsc

@@ -8,6 +8,14 @@
       "name": "id",
       "type": "string",
       "doc": "The id of the request corresponding to this response."
+    },
+    {
+      "name": "payload",
+      "type": [
+        "null",
+        "net.corda.data.p2p.crypto.AuthenticatedEncryptedDataMessage",
+        "net.corda.data.p2p.crypto.AuthenticatedDataMessage"
+      ]
     }
   ]
 }

gradle.properties

@@ -8,7 +8,6 @@ cordaProductVersion = 5.2.0
 cordaApiRevision = 16
 
 # Main
-kotlinVersion = 1.8.21
 kotlin.stdlib.default.dependency = false
 
 # These are the same annotations that Kotlin uses.

gradle/libs.versions.toml

@@ -46,6 +46,12 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab
 jackson-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jacksonVersion" }
 jackson-yaml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jacksonVersion" }
 assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertjVersion" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinVersion" }
+kotlin-stdlib-common = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common", version.ref = "kotlinVersion" }
+kotlin-stdlib-jdk7 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlinVersion" }
+kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlinVersion" }
+kotlin-osgi-bundle = { group = "org.jetbrains.kotlin", name = "kotlin-osgi-bundle", version.ref = "kotlinVersion" }
+kotlin-reflect= { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinVersion" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinVersion" }
 junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junitVersion" }
 junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
@@ -80,5 +86,8 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaVersion" }
 gradle-data = { id = "com.gradle.common-custom-user-data-gradle-plugin", version.ref = "gradleDataVersion" }
 gradle-enterprise = { id = "com.gradle.enterprise", version.ref = "gradleEnterpriseVersion" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgitVersion" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinVersion" }
+kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlinVersion" }
+kotlin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlinVersion" }
 snyk = { id = "io.snyk.gradle.plugin.snykplugin", version.ref = "snykVersion" }
 task-tree = { id = "com.dorongold.task-tree", version.ref = "taskTreeVersion" }

settings.gradle

@@ -28,9 +28,6 @@ pluginManagement {
     plugins {
         id 'com.gradle.enterprise' version gradleEnterpriseVersion
         id 'com.gradle.common-custom-user-data-gradle-plugin' version gradleDataPlugin
-        id 'org.jetbrains.kotlin.jvm' version kotlinVersion
-        id 'org.jetbrains.kotlin.plugin.allopen' version kotlinVersion
-        id 'org.jetbrains.kotlin.plugin.jpa' version kotlinVersion
         id "com.jfrog.artifactory" version artifactoryPluginVersion
     }
 }