From 74dea999b93262ffa3838c7375c473a8310ba75c Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Sat, 29 Aug 2020 18:51:56 -0700 Subject: [PATCH 1/4] Add dependencies that had been leaking out of api --- ms2/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ms2/build.gradle b/ms2/build.gradle index 241ef91152..7392c8dfd8 100644 --- a/ms2/build.gradle +++ b/ms2/build.gradle @@ -1,6 +1,8 @@ import org.labkey.gradle.util.BuildUtils dependencies { + external("org.apache.httpcomponents:httpmime:${httpmimeVersion}") + external("org.ardverk:patricia-trie:${patriciaTrieVersion}") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "experiment"), depProjectConfig: "published", depExtension: "module") From 08913748b564a78aa8d561e74014b69d84189eab Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 15:17:28 -0700 Subject: [PATCH 2/4] Remove commons-math3 from :server:modules:platform:api --- elisa/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/elisa/build.gradle b/elisa/build.gradle index 055e4d3334..8129cdb414 100644 --- a/elisa/build.gradle +++ b/elisa/build.gradle @@ -1,5 +1,9 @@ import org.labkey.gradle.util.BuildUtils +dependencies { + external "org.apache.commons:commons-math3:${commonsMath3Version}" +} + BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "published", depExtension: "module") From 2f7f59350d1d596c2155829fe9fb5fe2d8c6dfd4 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 16:21:02 -0700 Subject: [PATCH 3/4] Remove dependency from jspImplementation to deprecated compile configuration --- flow/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/flow/build.gradle b/flow/build.gradle index c01d49ef95..cf3e9d3048 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -19,7 +19,6 @@ dependencies { implementation sourceSets.engine.output jspImplementation sourceSets.engine.output jspImplementation project.files(project.tasks.schemasCompile) - BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: project.path, depProjectConfig: 'compile') BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "experiment"), depProjectConfig: "published", depExtension: "module") BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "query"), depProjectConfig: "published", depExtension: "module") From 7740a638d5d920902ea99aa74c080b5cb7628f38 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 13:17:34 -0700 Subject: [PATCH 4/4] Align jars.txt with dependency declarations --- elisa/resources/credits/jars.txt | 4 ++++ ms2/resources/credits/jars.txt | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 elisa/resources/credits/jars.txt create mode 100644 ms2/resources/credits/jars.txt diff --git a/elisa/resources/credits/jars.txt b/elisa/resources/credits/jars.txt new file mode 100644 index 0000000000..ec47eb0a97 --- /dev/null +++ b/elisa/resources/credits/jars.txt @@ -0,0 +1,4 @@ +{table} +Filename|Component|Version|Source|License|LabKey Dev|Purpose +commons-math3-3.6.1.jar|Commons Math|3.6.1|{link:Apache|http://commons.apache.org/math/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|Lightweight, self-contained mathematics and statistics components +{table} diff --git a/ms2/resources/credits/jars.txt b/ms2/resources/credits/jars.txt new file mode 100644 index 0000000000..d0a71fb941 --- /dev/null +++ b/ms2/resources/credits/jars.txt @@ -0,0 +1,5 @@ +{table} +Filename|Component|Version|Source|License|LabKey Dev|Purpose +httpmime-4.5.3.jar|Apache HTTP Mime|4.5.3|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers +patricia-trie-0.6.jar|PATRICIA Trie|0.6|{link:PATRICIA Trie|http://code.google.com/p/patricia-trie/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|PATRICIA Trie data structure implementation +{table}