From cc74ec11bd788888bb19383806efa64543989d1e Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 12:19:51 -0700 Subject: [PATCH 1/3] sqllite-jdbc no longer from :server:modules:platform:api --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index b8e2b0f0a..1a2298ce0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ import org.labkey.gradle.util.BuildUtils; dependencies { external 'com.google.protobuf:protobuf-java:3.12.2' + external "org.xerial:sqlite-jdbc:3.7.2" implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") From a048ae41c7bc856f16e3f19c26382755512b2a55 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 15:18:06 -0700 Subject: [PATCH 2/3] Remove commons-math3 from api module dependencies --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 1a2298ce0..77fd664fe 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ dependencies { external 'com.google.protobuf:protobuf-java:3.12.2' external "org.xerial:sqlite-jdbc:3.7.2" + external "org.apache.commons:commons-math3:${commonsMath3Version}" implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") From cd3b8f1f34bc9b9e29d6cde75beef8aeaaaffadc Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 13:17:35 -0700 Subject: [PATCH 3/3] Align jars.txt with dependency declarations --- build.gradle | 1 + resources/credits/jars.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 77fd664fe..162d9b991 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ dependencies external 'com.google.protobuf:protobuf-java:3.12.2' external "org.xerial:sqlite-jdbc:3.7.2" external "org.apache.commons:commons-math3:${commonsMath3Version}" + external "org.jfree:jcommon:1.0.17" implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile") diff --git a/resources/credits/jars.txt b/resources/credits/jars.txt index 20b893f24..b1c8df5c6 100644 --- a/resources/credits/jars.txt +++ b/resources/credits/jars.txt @@ -1,4 +1,7 @@ {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}||Lightweight, self-contained mathematics and statistics components +jcommon-1.0.17.jar|JFree Chart|1.0.17|{link:JFreeChart|http://www.jfree.org/jfreechart/}|{link:LGPL|http://www.gnu.org/licenses/lgpl.txt}||PNG encoder protobuf-java-3.12.2.jar|Protocol Buffers|3.12.2|{link:Github Google|https://github.com/google/protobuf/releases}|{link:Custom|https://github.com/google/protobuf/blob/master/LICENSE}|nicksh|Binary data parsing +sqlite-jdbc-3.7.2.jar|SQLite JDBC Driver|3.7.2|{link:bitbucket.org|https://bitbucket.org/xerial/sqlite-jdbc/wiki/Home}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|vsharma|SQLite JDBC Driver {table}