From 0ee5396fda3d53d157e1a88ea6e204eb133c58a6 Mon Sep 17 00:00:00 2001 From: Susan Hert Date: Wed, 16 Jun 2021 13:46:44 -0700 Subject: [PATCH] Dependency version update for 21.7 (#121) --- .gitignore | 2 ++ gradle.properties | 2 +- lincs/build.gradle | 15 ++++++++++++++- panoramapublic/build.gradle | 14 +++++++++++++- panoramapublic/resources/credits/jars.txt | 4 ---- testresults/build.gradle | 18 +++++++++++++++--- testresults/resources/credits/jars.txt | 4 ---- 7 files changed, 45 insertions(+), 14 deletions(-) delete mode 100644 panoramapublic/resources/credits/jars.txt delete mode 100644 testresults/resources/credits/jars.txt diff --git a/.gitignore b/.gitignore index 9f1233f9..c25efa8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /hidra /hidra_uw_intake +*/resources/credits/dependencies.txt +*/resources/credits/jars.txt diff --git a/gradle.properties b/gradle.properties index 7ea32564..b4071a28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -moduleContainer=:server:modules:maccossLabModules +moduleContainer=:server:modules:MacCossLabModules diff --git a/lincs/build.gradle b/lincs/build.gradle index 26204c95..bac71a44 100644 --- a/lincs/build.gradle +++ b/lincs/build.gradle @@ -1,4 +1,5 @@ import org.labkey.gradle.util.BuildUtils; +import org.labkey.gradle.util.ExternalDependency; plugins { id 'org.labkey.build.module' @@ -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') } diff --git a/panoramapublic/build.gradle b/panoramapublic/build.gradle index 32a0336c..9ea77094 100644 --- a/panoramapublic/build.gradle +++ b/panoramapublic/build.gradle @@ -1,4 +1,5 @@ import org.labkey.gradle.util.BuildUtils; +import org.labkey.gradle.util.ExternalDependency; plugins { id 'org.labkey.build.module' @@ -6,7 +7,18 @@ plugins { 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") diff --git a/panoramapublic/resources/credits/jars.txt b/panoramapublic/resources/credits/jars.txt deleted file mode 100644 index d1ee6518..00000000 --- a/panoramapublic/resources/credits/jars.txt +++ /dev/null @@ -1,4 +0,0 @@ -{table} -Filename|Component|Version|Source|License|LabKey Dev|Purpose -httpmime-4.5.3.jar|Apache HTTP Mime|4.5.3|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers -{table} diff --git a/testresults/build.gradle b/testresults/build.gradle index 6eb4fb92..d5f5f9ed 100644 --- a/testresults/build.gradle +++ b/testresults/build.gradle @@ -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" + ) +) diff --git a/testresults/resources/credits/jars.txt b/testresults/resources/credits/jars.txt deleted file mode 100644 index 6543d5d4..00000000 --- a/testresults/resources/credits/jars.txt +++ /dev/null @@ -1,4 +0,0 @@ -{table} -Filename|Component|Version|Source|License|Purpose -commons-fileupload-1.3.1.jar|Commons File Upload|1.3.1|{link:Apache|http://jakarta.apache.org/commons/fileupload/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|Parses HTTP multipart/form-data POSTs -{table}