editing build files to fix imports after module move

corda · Jun 28, 2023 · a1c3e45 · a1c3e45
1 parent 510588d
commit a1c3e45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/components/flow/flow-mapper-impl/build.gradle b/components/flow/flow-mapper-impl/build.gradle
@@ -8,9 +8,9 @@ dependencies {
     compileOnly 'org.osgi:osgi.annotation'
     compileOnly 'org.osgi:org.osgi.service.component.annotations'
 
+    implementation project(":components:flow:flow-mapper")
     implementation project(":libs:configuration:configuration-core")
     implementation project(":libs:messaging:messaging")
-    implementation project(":libs:flows:flow-mapper")
     implementation project(":libs:flows:session-manager")
     implementation project(":libs:metrics")
     implementation project(':libs:utilities')

diff --git a/components/flow/flow-mapper-service/build.gradle b/components/flow/flow-mapper-service/build.gradle
@@ -12,9 +12,10 @@ dependencies {
     implementation project(":components:configuration:configuration-read-service")
     implementation project(":libs:lifecycle:lifecycle")
     implementation project(":libs:messaging:messaging")
-    implementation project(":libs:flows:flow-mapper")
     implementation project(":libs:tracing")
     implementation project(':libs:utilities')
+    implementation project(":components:flow:flow-mapper-impl")
+    implementation project(":components:flow:flow-mapper")
 
     implementation platform("net.corda:corda-api:$cordaApiVersion")
     implementation "net.corda:corda-base"
@@ -37,10 +38,10 @@ dependencies {
     integrationTestImplementation project(":testing:db-message-bus-testkit")
     integrationTestImplementation project(":libs:flows:flow-utils")
 
+    integrationTestRuntimeOnly project(":components:configuration:configuration-read-service-impl")
+    integrationTestRuntimeOnly project(":components:flow:flow-mapper-impl")
     integrationTestRuntimeOnly project(":libs:crypto:cipher-suite-impl")
     integrationTestRuntimeOnly project(":libs:lifecycle:lifecycle-impl")
-    integrationTestRuntimeOnly project(":components:configuration:configuration-read-service-impl")
-    integrationTestRuntimeOnly project(":libs:flows:flow-mapper-impl")
     integrationTestRuntimeOnly project(":libs:messaging:messaging-impl")
     integrationTestRuntimeOnly project(":libs:messaging:db-message-bus-impl")
     integrationTestRuntimeOnly project(":libs:schema-registry:schema-registry-impl")

diff --git a/processors/flow-processor/build.gradle b/processors/flow-processor/build.gradle
@@ -55,13 +55,13 @@ dependencies {
     runtimeOnly project(":components:uniqueness:uniqueness-checker-client-service-impl")
     runtimeOnly project(":components:virtual-node:cpi-info-read-service-impl")
     runtimeOnly project(":components:virtual-node:cpk-read-service-impl")
+    runtimeOnly project(":components:flow:flow-mapper-impl")
     runtimeOnly project(":libs:application:application-impl")
     runtimeOnly project(':libs:crypto:cipher-suite-impl')
     runtimeOnly project(":libs:crypto:crypto-serialization-impl")
     runtimeOnly project(':libs:crypto:merkle-impl')
     runtimeOnly project(":libs:flows:external-event-responses-impl")
     runtimeOnly project(":libs:flows:flow-api")
-    runtimeOnly project(":libs:flows:flow-mapper-impl")
     runtimeOnly project(":libs:flows:session-manager-impl")
     runtimeOnly project(":libs:messaging:messaging-impl")
     runtimeOnly project(':libs:ledger:ledger-common-data')

diff --git a/settings.gradle b/settings.gradle
@@ -102,6 +102,8 @@ include 'components:db:db-connection-manager-impl'
 include 'components:domino-logic'
 include 'components:external-messaging-services'
 include 'components:flow:flow-mapper-service'
+include 'components:flow:flow-mapper'
+include 'components:flow:flow-mapper-impl'
 include 'components:flow:flow-p2p-filter-service'
 include 'components:flow:flow-rest-resource-service'
 include 'components:flow:flow-rest-resource-service-impl'
@@ -234,8 +236,6 @@ include 'libs:external-messaging'
 include 'libs:flows:external-event-responses'
 include 'libs:flows:external-event-responses-impl'
 include 'libs:flows:flow-api'
-include 'libs:flows:flow-mapper'
-include 'libs:flows:flow-mapper-impl'
 include 'libs:flows:session-manager'
 include 'libs:flows:session-manager-impl'
 include 'libs:flows:flow-utils'