Merge remote-tracking branch 'origin/release/os/5.2' into vkolomeyko/…

…e2e-flake-investigation

# Conflicts:
#	gradle.properties

applications/workers/release/combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt

@@ -313,7 +313,7 @@ private class CombinedWorkerParams {
 
     @Option(names = ["--serviceEndpoint"], description = ["Internal REST endpoints for Corda workers"])
     val workerEndpoints: Map<String, String> =
-        listOf("crypto", "verification", "uniqueness", "persistence", "tokenSelection")
+        listOf("crypto", "verification", "uniqueness", "persistence", "tokenSelection", "p2pLinkManager")
             .associate { "endpoints.$it" to "localhost:7004" }
             .toMap()
 }

applications/workers/release/crypto-worker/build.gradle

@@ -38,8 +38,6 @@ dependencies {
 
 
     testRuntimeOnly "org.apache.felix:org.apache.felix.framework:$felixVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
 
     // This puts the jdbc driver into the docker image in the /opt/jdbc-driver folder
     // this folder can contain many jdbc drivers (and DataSourceFactory provider bundles).

applications/workers/release/db-worker/build.gradle

@@ -44,8 +44,6 @@ dependencies {
     runtimeOnly project(':libs:tracing-impl')
 
     testImplementation 'org.osgi:osgi.core'
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(':libs:application:addon')
     testImplementation project(':libs:application:banner')
     testImplementation project(":libs:lifecycle:lifecycle")

applications/workers/release/p2p-gateway-worker/src/main/kotlin/net.corda.applications.workers.p2p.gateway/GatewayWorker.kt

@@ -13,6 +13,7 @@ import net.corda.lifecycle.registry.LifecycleRegistry
 import net.corda.osgi.api.Application
 import net.corda.osgi.api.Shutdown
 import net.corda.processors.p2p.gateway.GatewayProcessor
+import net.corda.schema.configuration.BootConfig.BOOT_WORKER_SERVICE
 import net.corda.tracing.configureTracing
 import net.corda.tracing.shutdownTracing
 import net.corda.web.api.WebServer
@@ -21,6 +22,7 @@ import org.osgi.service.component.annotations.Component
 import org.osgi.service.component.annotations.Reference
 import org.slf4j.LoggerFactory
 import picocli.CommandLine
+import picocli.CommandLine.Option
 
 @Component
 @Suppress("LongParameterList")
@@ -63,7 +65,8 @@ class GatewayWorker @Activate constructor(
         val config = WorkerHelpers.getBootstrapConfig(
             secretsServiceFactoryResolver,
             params.defaultParams,
-            configurationValidatorFactory.createConfigValidator()
+            configurationValidatorFactory.createConfigValidator(),
+            listOf(WorkerHelpers.createConfigFromParams(BOOT_WORKER_SERVICE, params.workerEndpoints)),
         )
         webServer.start(params.defaultParams.workerServerPort)
         gatewayProcessor.start(config)
@@ -80,4 +83,11 @@ class GatewayWorker @Activate constructor(
 private class GatewayWorkerParams {
     @CommandLine.Mixin
     var defaultParams = DefaultWorkerParams()
+
+    @Option(
+        names = ["--serviceEndpoint"],
+        description = ["Internal REST endpoints for Corda workers"],
+        required = true,
+    )
+    val workerEndpoints: Map<String, String> = emptyMap()
 }

applications/workers/release/persistence-worker/build.gradle

@@ -43,8 +43,6 @@ dependencies {
     runtimeOnly project(':libs:web:web-impl')
 
     testImplementation 'org.osgi:osgi.core'
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(':libs:application:addon')
     testImplementation project(':libs:application:banner')
 

applications/workers/release/token-selection-worker/build.gradle

@@ -41,8 +41,6 @@ dependencies {
     runtimeOnly project(':libs:tracing-impl')
 
     testImplementation 'org.osgi:osgi.core'
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(':libs:application:addon')
     testImplementation project(':libs:application:banner')
 

applications/workers/release/uniqueness-worker/build.gradle

@@ -42,8 +42,6 @@ dependencies {
     runtimeOnly project(':libs:tracing-impl')
 
     testImplementation 'org.osgi:osgi.core'
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(':libs:application:addon')
     testImplementation project(':libs:application:banner')
 

applications/workers/worker-common/build.gradle

@@ -53,8 +53,6 @@ dependencies {
     runtimeOnly project(':libs:web:web-impl')
     runtimeOnly "org.apache.commons:commons-lang3:$commonsLangVersion"
 
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(":libs:web:web-impl")
 
     testRuntimeOnly 'org.osgi:osgi.core'

applications/workers/workers-smoketest/build.gradle

@@ -53,8 +53,6 @@ kotlin {
 
 dependencies {
     // NO CORDA DEPENDENCIES!!
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-
     smokeTestImplementation "net.corda:corda-avro-schema:$cordaApiVersion"
     // Avoid having the schema names and keys scattered across projects
     smokeTestImplementation "net.corda:corda-config-schema:$cordaApiVersion"
@@ -82,7 +80,8 @@ dependencies {
     smokeTestImplementation project(":testing:packaging-test-utilities")
     smokeTestImplementation project(':testing:test-utilities')
     smokeTestImplementation project(":testing:uniqueness:uniqueness-utilities")
-    smokeTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
+    smokeTestImplementation libs.bundles.test
+    smokeTestRuntimeOnly libs.bundles.test.runtime
     smokeTestRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
 }
 

build.gradle

@@ -14,9 +14,9 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' apply false
-    id 'org.jetbrains.kotlin.plugin.allopen' apply false
-    id 'org.jetbrains.kotlin.plugin.jpa' apply false
+    alias libs.plugins.kotlin.jvm apply false
+    alias libs.plugins.kotlin.allopen apply false
+    alias libs.plugins.kotlin.jpa apply false
     id 'io.gitlab.arturbosch.detekt' apply false
     id 'biz.aQute.bnd.builder' apply false
     id 'com.adarshr.test-logger' version '3.2.0' apply false
@@ -278,14 +278,6 @@ allprojects {
 
         shouldRunAfter tasks.named('test', Test)
     }
-
-    dependencies {
-        // Test utilities
-        testImplementation "org.assertj:assertj-core:$assertjVersion"
-        testImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    }
 }
 
 tasks.register('createSBOMZip', Zip) {
@@ -326,11 +318,11 @@ if (project.hasProperty('generateSBOM')) {
 void configureKotlinForOSGi(Configuration configuration) {
     configuration.resolutionStrategy {
         dependencySubstitution {
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-            substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+            substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
         }
     }
 }

buildSrc/settings.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create('libs', { from(files("../gradle/libs.versions.toml")) })
+    }
+}
+
+rootProject.name = 'buildSrc'

buildSrc/src/main/groovy/corda.common-app.gradle

@@ -20,11 +20,11 @@ plugins {
 def applyDependencySubstitution = { Configuration conf ->
     conf.resolutionStrategy.dependencySubstitution {
         //Replace Kotlin stdlib
-        substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-        substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-        substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-        substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
-        substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:$kotlinVersion")
+        substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk8') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+        substitute module('org.jetbrains.kotlin:kotlin-stdlib-jdk7') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+        substitute module('org.jetbrains.kotlin:kotlin-stdlib-common') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+        substitute module('org.jetbrains.kotlin:kotlin-stdlib') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
+        substitute module('org.jetbrains.kotlin:kotlin-reflect') using module("org.jetbrains.kotlin:kotlin-osgi-bundle:${libs.versions.kotlinVersion.get()}")
     }
 }
 

buildSrc/src/main/groovy/corda.common-library.gradle

@@ -2,6 +2,7 @@
 
 plugins {
     id 'java-library'
+    id 'org.jetbrains.kotlin.jvm'
     id 'biz.aQute.bnd.builder'
 }
 
@@ -39,12 +40,10 @@ configurations {
 
 dependencies {
     compileOnly "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
-    testImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.bundles.test
+    testRuntimeOnly libs.bundles.test.runtime
 
-    integrationTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
-    integrationTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    integrationTestRuntimeOnly libs.bundles.test.runtime
 }
 
 tasks.named('jar', Jar) {

buildSrc/src/main/groovy/corda.osgi-test-conventions.gradle

@@ -38,10 +38,9 @@ dependencies {
     }
     integrationTestRuntimeOnly files(configurations.quasarBundles)
 
-    integrationTestImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
+    integrationTestImplementation libs.bundles.test
     integrationTestImplementation "org.osgi:org.osgi.test.junit5:$osgiTestJunit5Version"
-    integrationTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    integrationTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
+    integrationTestRuntimeOnly libs.bundles.test.runtime
     integrationTestRuntimeOnly "org.apache.felix:org.apache.felix.framework:$felixVersion"
     integrationTestRuntimeOnly "org.apache.felix:org.apache.felix.scr:$felixScrVersion"
     integrationTestRuntimeOnly "org.osgi:org.osgi.service.component:$osgiServiceComponentVersion"

charts/corda/templates/workers.yaml

@@ -13,8 +13,8 @@
 {{- include "corda.worker" ( list $ .Values.workers.verification "verification" ) }}
 {{- include "corda.worker" ( list $ .Values.workers.membership "membership" ) }}
 {{- include "corda.worker" ( list $ .Values.workers.p2pGateway "p2pGateway"
-  ( dict "httpPort" 8080 )
-) }}
+    ( dict "httpPort" 8080 "servicesAccessed" ( list "p2pLinkManager" ) )
+  ) }}
 {{- include "corda.worker" ( list $ .Values.workers.p2pLinkManager "p2pLinkManager" ) }}
 {{- include "corda.worker" ( list $ .Values.workers.persistence "persistence"
     ( dict "clusterDbAccess" true )

components/chunking/chunk-db-write-impl/build.gradle

@@ -67,8 +67,6 @@ dependencies {
     integrationTestImplementation project(':libs:platform-info')
 
     testImplementation "com.google.jimfs:jimfs:$jimfsVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
 
     testRuntimeOnly "org.hsqldb:hsqldb:$hsqldbVersion"
     testRuntimeOnly "org.postgresql:postgresql:$postgresDriverVersion"

components/configuration/configuration-read-service-impl/build.gradle

@@ -31,8 +31,6 @@ dependencies {
 
     testImplementation project(":libs:lifecycle:lifecycle-impl")
     testImplementation project(":libs:lifecycle:lifecycle-test-impl")
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     integrationTestImplementation project(":testing:db-message-bus-testkit")
     integrationTestImplementation project(":testing:test-utilities")
     integrationTestImplementation project(":libs:lifecycle:registry")

components/configuration/configuration-rest-resource-service-impl/build.gradle

@@ -27,7 +27,4 @@ dependencies {
     implementation 'net.corda:corda-topic-schema'
     implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
-
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
 }

components/configuration/configuration-write-service-impl/build.gradle

@@ -26,7 +26,4 @@ dependencies {
     implementation 'net.corda:corda-topic-schema'
     implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
     implementation 'org.slf4j:slf4j-api'
-
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
 }

components/crypto/crypto-client-hsm-impl/build.gradle

@@ -23,8 +23,6 @@ dependencies {
     implementation project(":libs:messaging:messaging")
     implementation project(":libs:utilities")
 
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-
     testImplementation project(":components:crypto:crypto-component-test-utils")
 
     testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"

components/crypto/crypto-client-impl/build.gradle

@@ -24,8 +24,6 @@ dependencies {
     implementation project(":libs:messaging:messaging")
     implementation project(":libs:utilities")
 
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-
     testImplementation project(":components:crypto:crypto-component-test-utils")
 
     testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"

components/crypto/crypto-component-test-utils/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     api project(":libs:lifecycle:registry")
     api project(":testing:test-utilities")
 
-    api "org.assertj:assertj-core:$assertjVersion"
-    api "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
+    api libs.assertj.core
+    api libs.mockito.kotlin
 }
 

components/crypto/crypto-hes-impl/build.gradle

@@ -20,11 +20,6 @@ dependencies {
     implementation project(":components:crypto:crypto-component-core-impl")
     implementation project(":libs:crypto:crypto-core")
 
-    testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-
     testImplementation project(":components:crypto:crypto-component-test-utils")
     testImplementation project(":libs:crypto:cipher-suite-impl")
     testImplementation project(":testing:test-utilities")

components/crypto/crypto-persistence/build.gradle

@@ -31,12 +31,6 @@ dependencies {
     implementation project(":libs:metrics")
     implementation project(':libs:virtual-node:virtual-node-info')
 
-    testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-    testImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
-
 }
 
 

components/crypto/crypto-rest/build.gradle

@@ -28,7 +28,5 @@ dependencies {
     implementation "net.corda:corda-topic-schema"
     implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle'
 
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(':libs:lifecycle:lifecycle-test-impl')
 }

components/crypto/crypto-service-impl/build.gradle

@@ -47,7 +47,6 @@ dependencies {
 
     testImplementation project(":libs:cache:cache-caffeine")
     testImplementation 'net.corda:corda-application'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation project(":components:crypto:crypto-component-test-utils")
 
     testImplementation project(":components:crypto:crypto-persistence-model")

components/crypto/crypto-softhsm-impl/build.gradle

@@ -39,7 +39,6 @@ dependencies {
 
     implementation platform("net.corda:corda-api:$cordaApiVersion")
 
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
     testImplementation project(":components:crypto:crypto-component-test-utils")
     testImplementation project(":components:crypto:crypto-hes-impl")

components/db/db-connection-manager-impl/build.gradle

@@ -26,8 +26,6 @@ dependencies {
     implementation "com.typesafe:config:$typeSafeConfigVersion"
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
 
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testRuntimeOnly "org.osgi:osgi.core"
 
     integrationTestImplementation project(':libs:db:db-admin')

components/domino-logic/build.gradle

@@ -17,8 +17,6 @@ dependencies {
 
     implementation "com.typesafe:config:$typeSafeConfigVersion"
 
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation "org.apache.logging.log4j:log4j-core:$log4jVersion"
     testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
 }

components/external-messaging-services/build.gradle

@@ -22,8 +22,4 @@ dependencies {
     implementation project(':libs:messaging:message-bus')
     implementation project(":libs:utilities")
     implementation project(":libs:virtual-node:virtual-node-info")
-
-    testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
 }

components/flow/flow-mapper-impl/build.gradle

@@ -26,9 +26,6 @@ dependencies {
     implementation "net.corda:corda-config-schema"
     implementation "net.corda:corda-topic-schema"
 
-    testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation project(":testing:flow:flow-utilities")
     testImplementation project(":libs:flows:flow-utils")
 }

components/flow/flow-mapper-service/build.gradle

@@ -31,10 +31,6 @@ dependencies {
 
     runtimeOnly project(":libs:web:web-impl")
 
-    testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
-
     testImplementation project(":libs:lifecycle:lifecycle-test-impl")
     testImplementation project(":testing:test-utilities")
     testImplementation project(":testing:flow:flow-utilities")