From 466978cb3c459e3bea1f638a7a1b837c0375c694 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 16:47:09 +0000 Subject: [PATCH 1/4] ES-1621: active forward merge automation (#1335) --- .../forward-merge/JenkinsfileMergeAutomation | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .ci/dev/forward-merge/JenkinsfileMergeAutomation diff --git a/.ci/dev/forward-merge/JenkinsfileMergeAutomation b/.ci/dev/forward-merge/JenkinsfileMergeAutomation new file mode 100644 index 0000000000..64309e35e9 --- /dev/null +++ b/.ci/dev/forward-merge/JenkinsfileMergeAutomation @@ -0,0 +1,33 @@ +#! groovy +@Library('corda-shared-build-pipeline-steps@5.1') _ + +/** + * 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' +) + From 56ae8041b3d5c125820956214c6a15bd4586bd9b Mon Sep 17 00:00:00 2001 From: Yiftach Kaplan <67583323+yift-r3@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:57:38 +0000 Subject: [PATCH 2/4] CORE-18390: Allow old version of SetOwnRegistrationStatus in the command (#1342) --- .../registration/member/PersistMemberRegistrationState.avsc | 5 ++++- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc index 5a4e606f66..e0799f683d 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc +++ b/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" + ] } ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c44844ecd3..b7d3d05dcc 100644 --- a/gradle.properties +++ b/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 = 38 # Main kotlinVersion = 1.8.21 From 8203576a6ec485ef0950c46977a5925dbe16c6fe Mon Sep 17 00:00:00 2001 From: Yash Nabar Date: Fri, 17 Nov 2023 12:18:29 +0000 Subject: [PATCH 3/4] CORE-15267 Add `@CordaSerializable` to MemberContext and MGMContext (#1341) Marks `MemberContext` and `MGMContext` interfaces as `@CordaSerializable` to make `MemberInfo` serializable. The corresponding runtime-os change registers custom serializers for their implementation types. --- gradle.properties | 2 +- .../src/main/java/net/corda/v5/membership/MGMContext.java | 2 ++ .../src/main/java/net/corda/v5/membership/MemberContext.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b7d3d05dcc..9c603bdb5f 100644 --- a/gradle.properties +++ b/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 = 38 +cordaApiRevision = 39 # Main kotlinVersion = 1.8.21 diff --git a/membership/src/main/java/net/corda/v5/membership/MGMContext.java b/membership/src/main/java/net/corda/v5/membership/MGMContext.java index 4ffce49aef..c19a94996c 100644 --- a/membership/src/main/java/net/corda/v5/membership/MGMContext.java +++ b/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 {} diff --git a/membership/src/main/java/net/corda/v5/membership/MemberContext.java b/membership/src/main/java/net/corda/v5/membership/MemberContext.java index 306fd1a9ed..39ad8deebf 100644 --- a/membership/src/main/java/net/corda/v5/membership/MemberContext.java +++ b/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 {} From 90abfaea00d96dfe12237860376a0a431d193fd2 Mon Sep 17 00:00:00 2001 From: Connel McGovern <100574906+mcgovc@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:38:18 +0000 Subject: [PATCH 4/4] ES-1707: Revert Codeowners files to pre code freeze state (#1374) * ES-1707: Revert Codeowners files to pre code freeze state --- .github/CODEOWNERS | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 734204008d..f5a90dc2cf 100644 --- a/.github/CODEOWNERS +++ b/.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