Merge fixes

2025-06-23 01:19:00 +00:00 · 2018-01-25 18:51:29 +00:00
parent 4b86362391
commit 336aeb96e5
57 changed files with 109 additions and 154 deletions
--- a/core/src/smoke-test/kotlin/net/corda/core/PluginRegistrationTest.kt
+++ b/core/src/smoke-test/kotlin/net/corda/core/PluginRegistrationTest.kt
@ -32,6 +32,7 @@ class PluginRegistrationTest {
                p2pPort = 30100,
                rpcPort = 30101,
                webPort = 30102,
+                rpcAdminPort = 30103,
                isNotary = false,
                users = listOf(User("_", "_", setOf("ALL"))),
                jarDirs = listOf(jarDir))