Skip to content

Declare api and implementation dependencies to align with code usages #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 5 commits into from
Sep 18, 2020
Merged

Declare api and implementation dependencies to align with code usages #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c2e500
commons-net no longer coming out of :server:modules:platform:api
labkey-susanh Sep 7, 2020
56e3acf
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 12, 2020
fe53cab
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 17, 2020
1b93396
Align jars.txt with dependency declarations
labkey-susanh Sep 17, 2020
e6061f5
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ApiKey/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
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}
3 changes: 2 additions & 1 deletion DBUtils/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
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}
3 changes: 2 additions & 1 deletion DeviceProxy/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
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}
4 changes: 2 additions & 2 deletions WNPRC_Compliance/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
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}
2 changes: 1 addition & 1 deletion WNPRC_EHR/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Filename|Component|Version|Source|License|LabKey Dev|Purpose
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}
{table}
4 changes: 2 additions & 2 deletions wnprc_billing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -17,4 +17,4 @@ sourceSets {
}
java { srcDirs = ['src'] }
}
}
}
3 changes: 2 additions & 1 deletion wnprc_billing/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
{table}