From 9c2e5009c48eb5cc210cee24df015b9ea00bb595 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 7 Sep 2020 12:06:31 -0700 Subject: [PATCH 1/2] commons-net no longer coming out of :server:modules:platform:api --- wnprc_billing/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wnprc_billing/build.gradle b/wnprc_billing/build.gradle index 4e1ac7f54..aa0242906 100644 --- a/wnprc_billing/build.gradle +++ b/wnprc_billing/build.gradle @@ -3,7 +3,7 @@ import org.labkey.gradle.util.BuildUtils dependencies { external "com.koadweb.javafpdf:java-fpdf:${javafpdfVersion}" external("org.apache.sanselan:sanselan:${sanselanVersion}") - + external "commons-net:commons-net:${commonsNetVersion}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:ehrModules:ehr_billing", depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:ehrModules:ehr", depProjectConfig: "apiJarFile") @@ -17,4 +17,4 @@ sourceSets { } java { srcDirs = ['src'] } } -} \ No newline at end of file +} From 1b93396677dd3a213309efa18ea335741c2fdb77 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 13:17:34 -0700 Subject: [PATCH 2/2] Align jars.txt with dependency declarations --- ApiKey/resources/credits/jars.txt | 3 ++- DBUtils/resources/credits/jars.txt | 3 ++- DeviceProxy/resources/credits/jars.txt | 3 ++- WNPRC_Compliance/resources/credits/jars.txt | 4 ++-- WNPRC_EHR/resources/credits/jars.txt | 4 ++-- wnprc_billing/resources/credits/jars.txt | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ApiKey/resources/credits/jars.txt b/ApiKey/resources/credits/jars.txt index e3f8fc888..988c499c1 100644 --- a/ApiKey/resources/credits/jars.txt +++ b/ApiKey/resources/credits/jars.txt @@ -1,4 +1,5 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose 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 +jaxb-api-2.3.0.jar|Java Architecture for XML Binding (JAXB)|2.3.0|Oracle|{link:CDDL|https://oss.oracle.com/licenses/CDDL}|klum|Parsing XML +{table} diff --git a/DBUtils/resources/credits/jars.txt b/DBUtils/resources/credits/jars.txt index e3f8fc888..f6131df2d 100644 --- a/DBUtils/resources/credits/jars.txt +++ b/DBUtils/resources/credits/jars.txt @@ -1,4 +1,5 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose 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 +jaxb-api-2.3.0.jar|jaxb|2.3.0|Oracle|{link:CDDL 1.1|https://oss.oracle.com/licenses/CDDL+GPL-1.1}{link:GPL2w/ CPE|https://oss.oracle.com/licenses/CDDL+GPL-1.1}|klum|Parsing XML +{table} diff --git a/DeviceProxy/resources/credits/jars.txt b/DeviceProxy/resources/credits/jars.txt index e3f8fc888..988c499c1 100644 --- a/DeviceProxy/resources/credits/jars.txt +++ b/DeviceProxy/resources/credits/jars.txt @@ -1,4 +1,5 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose 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 +jaxb-api-2.3.0.jar|Java Architecture for XML Binding (JAXB)|2.3.0|Oracle|{link:CDDL|https://oss.oracle.com/licenses/CDDL}|klum|Parsing XML +{table} diff --git a/WNPRC_Compliance/resources/credits/jars.txt b/WNPRC_Compliance/resources/credits/jars.txt index 1af9cce80..803830fe7 100644 --- a/WNPRC_Compliance/resources/credits/jars.txt +++ b/WNPRC_Compliance/resources/credits/jars.txt @@ -1,5 +1,5 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose 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 -pdfbox-2.0.7.jar|Apache PDFBox|2.0.4|{link:From Apache|http://svn.apache.org/repos/asf/pdfbox/trunk/}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Generates and manipulates PDFs -{table} \ No newline at end of file +pdfbox-2.0.11.jar|Apache PDFBox|2.0.11|{link:From Apache|http://svn.apache.org/repos/asf/pdfbox/trunk/}|{link:Apache Software License 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jrichardson|Generates and manipulates PDFs +{table} diff --git a/WNPRC_EHR/resources/credits/jars.txt b/WNPRC_EHR/resources/credits/jars.txt index 7489d3c64..061fb4c99 100644 --- a/WNPRC_EHR/resources/credits/jars.txt +++ b/WNPRC_EHR/resources/credits/jars.txt @@ -1,6 +1,6 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose -joda-time-2.9.3.jar|Joda-Time|2.9.3|{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 +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 jsoup-1.10.3.jar|jsoup: Java HTML Parser|1.10.3|{link:From GitHub|https://github.com/jhy/jsoup}|{link:MIT License|https://opensource.org/licenses/MIT}|jricharson|Tools for parsing and manipulating HTML and CSS using the DOM reflections-0.9.10.jar|Reflections|0.9.10|{link:From GitHub|https://github.com/ronmamo/reflections}|{link:WTFPL|http://www.wtfpl.net/about/}|cstevens|Runtime analysis of Java classes and packages -{table} \ No newline at end of file +{table} diff --git a/wnprc_billing/resources/credits/jars.txt b/wnprc_billing/resources/credits/jars.txt index a9263ab2b..57b2789d5 100644 --- a/wnprc_billing/resources/credits/jars.txt +++ b/wnprc_billing/resources/credits/jars.txt @@ -1,5 +1,6 @@ {table} Filename|Component|Version|Source|License|LabKey Dev|Purpose +commons-net-3.5.jar|Commons Net|3.3|{link:Apache|http://jakarta.apache.org/commons/net/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|FTPClient used to retrieve resources from other servers (e.g., GO annotations) java-fpdf-1.6.0.jar|Java-FPDF PDF generation library|1.6.0|{link:Java-FPDF|https://github.com/nkiraly/Java-FPDF}|{link:BSD 2|https://github.com/nkiraly/Java-FPDF/blob/master/LICENSE.md}|jeckels|Used to generate PDF invoices sanselan-0.97-incubator.jar|Apache Commons Imaging|0.97|{link:Sanselan|https://commons.apache.org/proper/commons-imaging/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Required by Java-FPDF -{table} \ No newline at end of file +{table}