Skip to content

Commit 0ee5396

Browse files
Dependency version update for 21.7 (#121)
1 parent 9f84ef0 commit 0ee5396

File tree

7 files changed

+45
-14
lines changed

7 files changed

+45
-14
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/hidra
22
/hidra_uw_intake
3+
*/resources/credits/dependencies.txt
4+
*/resources/credits/jars.txt

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
moduleContainer=:server:modules:maccossLabModules
1+
moduleContainer=:server:modules:MacCossLabModules

lincs/build.gradle

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.labkey.gradle.util.BuildUtils;
2+
import org.labkey.gradle.util.ExternalDependency;
23

34
plugins {
45
id 'org.labkey.build.module'
@@ -10,7 +11,19 @@ dependencies {
1011
// exclude this because it gets in the way of our own JSON object implementations from server/api
1112
exclude group: "org.json", module:"json"
1213
}
13-
external "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
14+
15+
BuildUtils.addExternalDependency(
16+
project,
17+
new ExternalDependency(
18+
"org.apache.httpcomponents:httpmime:${httpmimeVersion}",
19+
"Apache HTTP Mime",
20+
"Apache",
21+
"http://hc.apache.org/httpcomponents-client-ga",
22+
ExternalDependency.APACHE_2_LICENSE_NAME,
23+
ExternalDependency.APACHE_2_LICENSE_URL,
24+
"HTTP client for requests of remote servers"
25+
)
26+
)
1427
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:targetedms", depProjectConfig: "apiJarFile")
1528
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:targetedms", depProjectConfig: 'published', depExtension: 'module')
1629
}

panoramapublic/build.gradle

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
import org.labkey.gradle.util.BuildUtils;
2+
import org.labkey.gradle.util.ExternalDependency;
23

34
plugins {
45
id 'org.labkey.build.module'
56
}
67

78
dependencies {
89
implementation "com.sun.mail:jakarta.mail:${javaMailVersion}"
9-
external "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
10+
BuildUtils.addExternalDependency(
11+
project,
12+
new ExternalDependency(
13+
"org.apache.httpcomponents:httpmime:${httpmimeVersion}",
14+
"Apache HTTP Mime",
15+
"Apache",
16+
"http://hc.apache.org/httpcomponents-client-ga",
17+
ExternalDependency.APACHE_2_LICENSE_NAME,
18+
ExternalDependency.APACHE_2_LICENSE_URL,
19+
"HTTP client for requests of remote servers"
20+
)
21+
)
1022
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile")
1123
BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "apiJarFile")
1224
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getCommonAssayModuleProjectPath(project.gradle, "ms2"), depProjectConfig: "published", depExtension: "module")

panoramapublic/resources/credits/jars.txt

-4
This file was deleted.

testresults/build.gradle

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1+
import org.labkey.gradle.util.BuildUtils
2+
import org.labkey.gradle.util.ExternalDependency
3+
14
plugins {
25
id 'org.labkey.build.module'
36
}
47

5-
dependencies {
6-
external "commons-fileupload:commons-fileupload:${commonsFileuploadVersion}"
7-
}
8+
BuildUtils.addExternalDependency(
9+
project,
10+
new ExternalDependency(
11+
"commons-fileupload:commons-fileupload:${commonsFileuploadVersion}",
12+
"Commons File Upload",
13+
"Apache",
14+
"http://jakarta.apache.org/commons/fileupload/",
15+
ExternalDependency.APACHE_2_LICENSE_NAME,
16+
ExternalDependency.APACHE_2_LICENSE_URL,
17+
"Parses HTTP multipart/form-data POSTs"
18+
)
19+
)

testresults/resources/credits/jars.txt

-4
This file was deleted.

0 commit comments

Comments
 (0)