ES-1707: Merging forward updates from release/os/5.1 to release/interop/syntax - 2024-01-17

.ci/dev/forward-merge/JenkinsfileMergeAutomation

@@ -0,0 +1,33 @@
+#! groovy
+@Library('[email protected]') _
+
+/**
+ * Forward merge any changes in current branch to the branch with following version.
+ *
+ * Please note, the branches names are intentionally separated as variables, to minimised conflicts
+ * during automated merges for this file.
+ *
+ * These variables should be updated when a new version is cut
+ */
+
+/**
+ * the branch name of origin branch, it should match the current branch
+ * and it acts as a fail-safe inside {@code forwardMerger} pipeline
+ */
+String originBranch = 'release/os/5.1'
+
+/**
+ * the branch name of target branch, it should be the branch with the next version
+ * after the one in current branch.
+ */
+String targetBranch = 'release/os/5.2'
+
+/**
+ * Forward merge any changes between {@code originBranch} and {@code targetBranch}
+ */
+forwardMerger(
+    targetBranch: targetBranch,
+    originBranch: originBranch,
+    slackChannel: '#c5-forward-merge-bot-notifications'
+)
+

.github/CODEOWNERS

@@ -1 +1,17 @@
-* @driessamyn @jasonbyrner3 @dimosr @ronanbrowne @rick-r3 @simon-johnson-r3 @blsemo @Omar-awad @aditisdesai @vinir3 @vkolomeyko @thiagoviana @Sakpal
+
+# Build scripts and Jenkins files should be audited by BLT
+# Any changes to source code of corda-api to be reviewd by C5 team leads
+
+Jenkinsfile        @corda/blt
+.ci/**             @corda/blt
+
+gradle/*           @corda/blt
+*.gradle           @corda/blt
+gradle.properties  @corda/corda5-team-leads
+
+*.kt               @corda/corda5-team-leads
+*.java             @corda/corda5-team-leads
+
+**/scans/*.yaml    @corda/corda5-team-leads
+
+CODEOWNERS         @corda/blt @corda/corda5-team-leads

data/avro-schema/src/main/resources/avro/net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc

@@ -12,7 +12,10 @@
     {
       "name": "setStatusRequest",
       "doc" : "The request to set the status.",
-      "type": "net.corda.data.membership.p2p.v2.SetOwnRegistrationStatus"
+      "type": [
+        "net.corda.data.membership.p2p.v2.SetOwnRegistrationStatus",
+        "net.corda.data.membership.p2p.SetOwnRegistrationStatus"
+      ]
     }
   ]
 }

gradle.properties

@@ -9,7 +9,7 @@ cordaProductVersion = 5.1.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 37
+cordaApiRevision = 39
 
 # Main
 kotlinVersion = 1.8.21

membership/src/main/java/net/corda/v5/membership/MGMContext.java

@@ -1,5 +1,6 @@
 package net.corda.v5.membership;
 
+import net.corda.v5.base.annotations.CordaSerializable;
 import net.corda.v5.base.types.LayeredPropertyMap;
 
 /**
@@ -32,4 +33,5 @@
  *
  * @see LayeredPropertyMap for further information on the properties and functions.
  */
+@CordaSerializable
 public interface MGMContext extends LayeredPropertyMap {}

membership/src/main/java/net/corda/v5/membership/MemberContext.java

@@ -1,5 +1,6 @@
 package net.corda.v5.membership;
 
+import net.corda.v5.base.annotations.CordaSerializable;
 import net.corda.v5.base.types.LayeredPropertyMap;
 
 /**
@@ -32,4 +33,5 @@
  *
  * @see LayeredPropertyMap For further information on the properties and functions.
  */
+@CordaSerializable
 public interface MemberContext extends LayeredPropertyMap {}