Merge branch 'release/os/5.2' into yift/core-18720/introduce-session-…

…state

# Conflicts:
#	gradle.properties

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/DecryptRpcCommand.avsc

@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "DecryptRpcCommand",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.request",
+  "doc": "Request to decrypt the given byte array",
+  "fields": [
+    {
+      "name": "category",
+      "type": "string",
+      "doc": "The category of HSM e.g. ENCRYPTION_SECRET, TLS, etc."
+    },
+    {
+      "name": "alias",
+      "type": ["null", "string"],
+      "doc": "The symmetric key alias."
+    },
+    {
+      "name": "cipherBytes",
+      "type": "bytes",
+      "doc": "The data to decrypt."
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/EncryptRpcCommand.avsc

@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "EncryptRpcCommand",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.request",
+  "doc": "Request to encrypt the given byte array",
+  "fields": [
+    {
+      "name": "category",
+      "type": "string",
+      "doc": "The category of HSM e.g. ENCRYPTION_SECRET, TLS, etc."
+    },
+    {
+      "name": "alias",
+      "type": ["null", "string"],
+      "doc": "The symmetric key alias."
+    },
+    {
+      "name": "plainBytes",
+      "type": "bytes",
+      "doc": "The data to encrypt."
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoDecryptionResult.avsc

@@ -0,0 +1,13 @@
+{
+  "type": "record",
+  "name": "CryptoDecryptionResult",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Decryption operation response",
+  "fields": [
+    {
+      "name": "plainBytes",
+      "type": "bytes",
+      "doc": "Decrypted byte array"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoEncryptionResult.avsc

@@ -0,0 +1,13 @@
+{
+  "type": "record",
+  "name": "CryptoEncryptionResult",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Encryption operation response",
+  "fields": [
+    {
+      "name": "cipherBytes",
+      "type": "bytes",
+      "doc": "Encrypted byte array"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/response/DecryptionOpsResponse.avsc

@@ -0,0 +1,16 @@
+{
+  "type": "record",
+  "name": "DecryptionOpsResponse",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Response for crypto's decryption operations envelope",
+  "fields": [
+    {
+      "name": "response",
+      "type": [
+        "net.corda.data.crypto.wire.ops.encryption.response.CryptoDecryptionResult",
+        "net.corda.data.crypto.wire.ops.encryption.response.EncryptionOpsError"
+      ],
+      "doc": "Response's payload, depends on the requested operation"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsError.avsc

@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "EncryptionOpsError",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Error result while performing encryption or decryption operation.",
+  "fields": [
+    {
+      "name": "errorMessage",
+      "type": "net.corda.data.ExceptionEnvelope"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsResponse.avsc

@@ -0,0 +1,16 @@
+{
+  "type": "record",
+  "name": "EncryptionOpsResponse",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Response for crypto's encryption operations envelope",
+  "fields": [
+    {
+      "name": "response",
+      "type": [
+        "net.corda.data.crypto.wire.ops.encryption.response.CryptoEncryptionResult",
+        "net.corda.data.crypto.wire.ops.encryption.response.EncryptionOpsError"
+      ],
+      "doc": "Response's payload, depends on the requested operation"
+    }
+  ]
+}

gradle.properties

@@ -25,7 +25,6 @@ publicArtifactURL = https://download.corda.net/maven
 # dokka need more metaspace - https://github.com/Kotlin/dokka/issues/1405
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=2g
 internalPluginVersion = 1.+
-artifactoryPluginVersion = 4.28.2
 
 gradleEnterpriseVersion = 3.14.1
 gradleDataPlugin = 1.8.2

gradle/libs.versions.toml

@@ -19,13 +19,12 @@ bndlibVersion = "7.0.0"
 # Testing
 assertjVersion = "3.24.2"
 junitVersion = "5.10.1"
-mockitoVersion = "5.3.0"
+mockitoVersion = "5.8.0"
 mockitoKotlinVersion = "5.2.1"
 
 # Plugins
-artifactoryVersion = "4.28.2"
 avroGradleVersion = "1.3.0"
-cyclonedxVersion = "1.7.4"
+cyclonedxVersion = "1.8.1"
 dokkaVersion = "1.8.20"
 detektVersion = "1.23.4"
 dependencyCheckVersion = "0.46.0"
@@ -78,7 +77,6 @@ test-runtime = ["junit-engine", "junit-platform"]
 
 [plugins]
 avro-gradle = { id = "com.github.davidmc24.gradle.plugin.avro-base", version.ref = "avroGradleVersion" }
-artifactory = { id = "com.jfrog.artifactory", version.ref = "artifactoryVersion" }
 cyclonedx-bom = { id = "org.cyclonedx.bom", version.ref = "cyclonedxVersion" }
 dependency-check-versions = { id = "com.github.ben-manes.versions", version.ref = "dependencyCheckVersion" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" }

settings.gradle

@@ -24,11 +24,9 @@ pluginManagement {
         }
 
     }
-
     plugins {
         id 'com.gradle.enterprise' version gradleEnterpriseVersion
         id 'com.gradle.common-custom-user-data-gradle-plugin' version gradleDataPlugin
-        id "com.jfrog.artifactory" version artifactoryPluginVersion
     }
 }
 plugins {