From a0efa1f15eb5c5cc912c42c4bf18a3e45a0c19d2 Mon Sep 17 00:00:00 2001 From: alaskowski <alaskowski@ethz.ch> Date: Mon, 13 Feb 2023 13:44:03 +0100 Subject: [PATCH] SSDM-13365: added missing dependencies to api-openbis-javascript project --- api-openbis-javascript/build.gradle | 3 --- api-openbis-javascript/settings.gradle | 1 - server-original-data-store/build.gradle | 1 + server-original-data-store/settings.gradle | 3 ++- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api-openbis-javascript/build.gradle b/api-openbis-javascript/build.gradle index 83d57f373d8..483e5d844e5 100644 --- a/api-openbis-javascript/build.gradle +++ b/api-openbis-javascript/build.gradle @@ -2,9 +2,6 @@ plugins { id "com.github.node-gradle.node" version "3.2.1" } -evaluationDependsOn(':core-plugin-openbis') -evaluationDependsOn(':server-application-server') - apply from: '../build/javaproject.gradle' node { diff --git a/api-openbis-javascript/settings.gradle b/api-openbis-javascript/settings.gradle index 1477fd012f8..e69de29bb2d 100644 --- a/api-openbis-javascript/settings.gradle +++ b/api-openbis-javascript/settings.gradle @@ -1 +0,0 @@ -includeFlat 'core-plugin-openbis', 'server-application-server' \ No newline at end of file diff --git a/server-original-data-store/build.gradle b/server-original-data-store/build.gradle index 1589a7a3241..29e9b2cf6b4 100644 --- a/server-original-data-store/build.gradle +++ b/server-original-data-store/build.gradle @@ -1,6 +1,7 @@ evaluationDependsOn(':lib-commonbase') evaluationDependsOn(':lib-common') evaluationDependsOn(':api-openbis-java') +evaluationDependsOn(':api-openbis-javascript') evaluationDependsOn(':lib-openbis-common') evaluationDependsOn(':lib-authentication') evaluationDependsOn(':lib-dbmigration') diff --git a/server-original-data-store/settings.gradle b/server-original-data-store/settings.gradle index 9f7f64fb01f..9cd9754f77a 100644 --- a/server-original-data-store/settings.gradle +++ b/server-original-data-store/settings.gradle @@ -1 +1,2 @@ -includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server' +includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', + 'lib-dbmigration', 'server-application-server', 'api-openbis-javascript' -- GitLab