Merge remote-tracking branch 'origin/release/os/5.2' into mbrkic-r3/C…

…ORE-18320/flow-timeout # Conflicts: # gradle.properties
corda · Dec 15, 2023 · 602a075 · 602a075
2 parents 82d9704 + 26b439d
commit 602a075
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java b/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java
@@ -48,4 +48,5 @@ private BootConfig() {
     public static final String UNIQUENESS_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.uniqueness";
     public static final String PERSISTENCE_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.persistence";
     public static final String TOKEN_SELECTION_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.tokenSelection";
+    public static final String P2P_LINK_MANAGER_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.p2pLinkManager";
 }
diff --git a/.../schema/membership/member/dynamic/registration/1.0/corda.member.dynamic.registration.json b/.../schema/membership/member/dynamic/registration/1.0/corda.member.dynamic.registration.json
@@ -72,7 +72,8 @@
       "examples": [
         "true",
         "false"
-      ]
+      ],
+      "default": "true"
     },
     "corda.notary.service.flow.protocol.name": {
       "description": "Name of the flow protocol used by the notary service. Valid only when one of the roles is notary.",

diff --git a/...da/schema/membership/member/static/registration/1.0/corda.member.static.registration.json b/...da/schema/membership/member/static/registration/1.0/corda.member.static.registration.json
@@ -47,7 +47,8 @@
       "examples": [
         "true",
         "false"
-      ]
+      ],
+      "default": "true"
     },
     "corda.notary.service.flow.protocol.name": {
       "description": "Name of the flow protocol used by the notary service. Valid only when one of the roles is notary.",

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ cordaProductVersion = 5.2.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 = 14
+cordaApiRevision = 16
 
 # Main
 kotlinVersion = 1.8.21
@@ -34,4 +34,4 @@ org.gradle.caching = true
 gradleEnterpriseUrl = https://gradle.dev.r3.com
 
 # Kotlin build
-kotlin.build.report.output=file,build_scan
+kotlin.build.report.output=file,build_scan