From 63985fea06522c9b35024ff0288a437dabf5e48b Mon Sep 17 00:00:00 2001 From: Dries Samyn Date: Mon, 2 Oct 2023 09:25:21 +0100 Subject: [PATCH] More OSGi nonsense. --- applications/examples/sandbox-app/build.gradle | 1 + libs/db/db-orm-impl/build.gradle | 5 +++++ processors/db-processor/build.gradle | 6 ------ processors/flow-mapper-processor/build.gradle | 1 + processors/flow-processor/build.gradle | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/examples/sandbox-app/build.gradle b/applications/examples/sandbox-app/build.gradle index 786cfd556f5..6c10a2c33f8 100644 --- a/applications/examples/sandbox-app/build.gradle +++ b/applications/examples/sandbox-app/build.gradle @@ -65,6 +65,7 @@ dependencies { runtimeOnly project(':libs:messaging:db-message-bus-impl') runtimeOnly project(':libs:serialization:serialization-checkpoint-api') runtimeOnly project(':libs:serialization:serialization-kryo') + runtimeOnly project(":libs:state-manager:state-manager-db-impl") runtimeOnly project(':testing:group-policy-test-common') runtimeOnly project(':libs:web:web-impl') diff --git a/libs/db/db-orm-impl/build.gradle b/libs/db/db-orm-impl/build.gradle index 04a8fdcb217..b657dfcca83 100644 --- a/libs/db/db-orm-impl/build.gradle +++ b/libs/db/db-orm-impl/build.gradle @@ -27,6 +27,11 @@ dependencies { exclude group: 'org.osgi' } runtimeOnly project(':libs:antlr') + runtimeOnly "com.sun.activation:javax.activation:$activationVersion" + runtimeOnly "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:$ariesDynamicFrameworkExtensionVersion" + runtimeOnly "org.liquibase:liquibase-core:$liquibaseVersion" + // NOTE: this is needed by Liquibase but for some reason not picked up automatically. + runtimeOnly "commons-beanutils:commons-beanutils:$beanutilsVersion" implementation project(":libs:db:db-core") implementation project(":libs:db:db-orm") diff --git a/processors/db-processor/build.gradle b/processors/db-processor/build.gradle index 560398dce3f..5f87ac291a8 100644 --- a/processors/db-processor/build.gradle +++ b/processors/db-processor/build.gradle @@ -101,12 +101,6 @@ dependencies { runtimeOnly project(':libs:schema-registry:schema-registry-impl') runtimeOnly project(":libs:web:web-impl") - runtimeOnly "com.sun.activation:javax.activation:$activationVersion" - runtimeOnly "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:$ariesDynamicFrameworkExtensionVersion" - runtimeOnly "org.liquibase:liquibase-core:$liquibaseVersion" - // NOTE: this is needed by Liquibase but for some reason not picked up automatically. - runtimeOnly "commons-beanutils:commons-beanutils:$beanutilsVersion" - testRuntimeOnly "org.postgresql:postgresql:$postgresDriverVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" diff --git a/processors/flow-mapper-processor/build.gradle b/processors/flow-mapper-processor/build.gradle index 4e55722062f..1441efb4245 100644 --- a/processors/flow-mapper-processor/build.gradle +++ b/processors/flow-mapper-processor/build.gradle @@ -50,6 +50,7 @@ dependencies { runtimeOnly project(':libs:crypto:cipher-suite-impl') runtimeOnly project(":libs:crypto:crypto-serialization-impl") runtimeOnly project(':libs:crypto:merkle-impl') + runtimeOnly project(':libs:db:db-orm-impl') runtimeOnly project(":libs:flows:external-event-responses-impl") runtimeOnly project(":libs:flows:flow-api") runtimeOnly project(":libs:flows:session-manager-impl") diff --git a/processors/flow-processor/build.gradle b/processors/flow-processor/build.gradle index 8f099f4b84b..a463888f3d0 100644 --- a/processors/flow-processor/build.gradle +++ b/processors/flow-processor/build.gradle @@ -58,6 +58,7 @@ dependencies { 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:db:db-orm-impl') runtimeOnly project(":libs:flows:external-event-responses-impl") runtimeOnly project(":libs:flows:flow-api") runtimeOnly project(":libs:flows:session-manager-impl")