Skip to content

Update dependencies for 21.7 #343

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.

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
merged 5 commits into from
Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Generated files
*/resources/credits/dependencies.txt
*/resources/credits/jars.txt
16 changes: 13 additions & 3 deletions elisa/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.ExternalDependency

plugins {
id 'org.labkey.build.module'
}

dependencies {
external "org.apache.commons:commons-math3:${commonsMath3Version}"
}
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.apache.commons:commons-math3:${commonsMath3Version}",
"Commons Math",
"Apache",
"http://commons.apache.org/math/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"Lightweight, self-contained mathematics and statistics components"
)
)

BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")

Expand Down
2 changes: 1 addition & 1 deletion elisa/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions elisa/resources/credits/jars.txt

This file was deleted.

27 changes: 25 additions & 2 deletions ms2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.ExternalDependency

plugins {
id 'org.labkey.build.module'
}

dependencies {
external("org.apache.httpcomponents:httpmime:${httpmimeVersion}")
external("org.ardverk:patricia-trie:${patriciaTrieVersion}")
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.apache.httpcomponents:httpmime:${httpmimeVersion}",
"Apache HTTP Mime",
"Apache",
"http://hc.apache.org/httpcomponents-client-ga",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"HTTP client for requests of remote servers"
)
)
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.ardverk:patricia-trie:${patriciaTrieVersion}",
"PATRICIA Trie",
"PATRICIA Trie",
"http://code.google.com/p/patricia-trie/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"PATRICIA Trie data structure implementation"
)
)
implementation "net.sf.opencsv:opencsv:${opencsvVersion}"
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")

Expand Down
5 changes: 0 additions & 5 deletions ms2/resources/credits/jars.txt

This file was deleted.