Skip to content

Dependency version update for 21.7 #121

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 3 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/hidra
/hidra_uw_intake
*/resources/credits/dependencies.txt
*/resources/credits/jars.txt
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
moduleContainer=:server:modules:maccossLabModules
moduleContainer=:server:modules:MacCossLabModules
15 changes: 14 additions & 1 deletion lincs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.labkey.gradle.util.BuildUtils;
import org.labkey.gradle.util.ExternalDependency;

plugins {
id 'org.labkey.build.module'
Expand All @@ -10,7 +11,19 @@ dependencies {
// exclude this because it gets in the way of our own JSON object implementations from server/api
exclude group: "org.json", module:"json"
}
external "org.apache.httpcomponents:httpmime:${httpmimeVersion}"

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.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:targetedms", depProjectConfig: "apiJarFile")
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:targetedms", depProjectConfig: 'published', depExtension: 'module')
}
14 changes: 13 additions & 1 deletion panoramapublic/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
import org.labkey.gradle.util.BuildUtils;
import org.labkey.gradle.util.ExternalDependency;

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

dependencies {
implementation "com.sun.mail:jakarta.mail:${javaMailVersion}"
external "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
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.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")
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "published", depExtension: "module")
Expand Down
4 changes: 0 additions & 4 deletions panoramapublic/resources/credits/jars.txt

This file was deleted.

18 changes: 15 additions & 3 deletions testresults/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.ExternalDependency

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

dependencies {
external "commons-fileupload:commons-fileupload:${commonsFileuploadVersion}"
}
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"commons-fileupload:commons-fileupload:${commonsFileuploadVersion}",
"Commons File Upload",
"Apache",
"http://jakarta.apache.org/commons/fileupload/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"Parses HTTP multipart/form-data POSTs"
)
)
4 changes: 0 additions & 4 deletions testresults/resources/credits/jars.txt

This file was deleted.