From f170109fbe4a3ac4bd35e5ae0ca52a47958f507f Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 22 Sep 2020 14:55:55 -0700 Subject: [PATCH 1/2] Add missing dependencies on opencsv and httpmime that used to be leaking out of the labkey-client-api. Since both of these dependencies are included in the api module transitively, we compromise a bit and do not include them in the jars.txt for each individual module. --- WNPRC_EHR/build.gradle | 1 + wnprc_billing/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/WNPRC_EHR/build.gradle b/WNPRC_EHR/build.gradle index 00423771e..f40321bda 100644 --- a/WNPRC_EHR/build.gradle +++ b/WNPRC_EHR/build.gradle @@ -1,6 +1,7 @@ import org.labkey.gradle.util.BuildUtils dependencies { + implementation "net.sf.opencsv:opencsv:${opencsvVersion}" implementation project(BuildUtils.getPlatformModuleProjectPath(project.gradle, "study")) BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:ehrModules:ehr", depProjectConfig: "apiJarFile") diff --git a/wnprc_billing/build.gradle b/wnprc_billing/build.gradle index aa0242906..b7f322ff1 100644 --- a/wnprc_billing/build.gradle +++ b/wnprc_billing/build.gradle @@ -1,6 +1,7 @@ import org.labkey.gradle.util.BuildUtils dependencies { + implementation "net.sf.opencsv:opencsv:${opencsvVersion}" external "com.koadweb.javafpdf:java-fpdf:${javafpdfVersion}" external("org.apache.sanselan:sanselan:${sanselanVersion}") external "commons-net:commons-net:${commonsNetVersion}" From 7334845ad65883d6b9b601dbb39f3def940aa71e Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 22 Sep 2020 14:56:40 -0700 Subject: [PATCH 2/2] Correct version number for commons-collections4 --- Gringotts/resources/credits/jars.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gringotts/resources/credits/jars.txt b/Gringotts/resources/credits/jars.txt index 8c0a9b4d7..9f3f772c2 100644 --- a/Gringotts/resources/credits/jars.txt +++ b/Gringotts/resources/credits/jars.txt @@ -1,6 +1,6 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose -commons-collections4-4.1.jar|Apache Commons Collections|4.1|{link:From Apache|https://git-wip-us.apache.org/repos/asf?p=commons-collections.git}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Tools for managing Java collections +commons-collections4-4.2.jar|Apache Commons Collections|4.2|{link:From Apache|https://git-wip-us.apache.org/repos/asf?p=commons-collections.git}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Tools for managing Java collections joda-time-2.8.1.jar|Joda-Time|2.8.1|{link:From GitHub|https://github.com/JodaOrg/joda-time}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Tools for dealing with dates/times in Java jooq-3.8.4.jar|jOOQ|3.8.4|{link:From GitHub|https://github.com/jOOQ/jOOQ}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Database-mapping for Java -{table} \ No newline at end of file +{table}