Skip to content

Commit 9e55c61

Browse files
Update dependencies for 21.7 (#108)
1 parent 7e4a5e8 commit 9e55c61

File tree

4 files changed

+110
-33
lines changed

4 files changed

+110
-33
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@
1313
**/gen/**
1414

1515
# Ignore MacOS .DS_Store artifacts
16-
**/.DS_Store
16+
**/.DS_Store
17+
18+
#generated by Gradle
19+
SequenceAnalysis/resources/credits/jars.txt
20+
SequenceAnalysis/resources/credits/dependencies.txt

SequenceAnalysis/build.gradle

Lines changed: 105 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.labkey.gradle.plugin.extension.TeamCityExtension
44
import org.labkey.gradle.util.BuildUtils
55
import org.labkey.gradle.util.GroupNames
66
import org.labkey.gradle.util.PropertiesUtils
7+
import org.labkey.gradle.util.ExternalDependency
78

89
import java.util.regex.Matcher
910

@@ -16,26 +17,118 @@ repositories {
1617

1718
dependencies {
1819
apiImplementation "com.github.samtools:htsjdk:${htsjdkVersion}"
19-
external "com.github.samtools:htsjdk:${htsjdkVersion}"
20+
BuildUtils.addExternalDependency(
21+
project,
22+
new ExternalDependency(
23+
"com.github.samtools:htsjdk:${htsjdkVersion}",
24+
'htsjdk',
25+
'htsjdk',
26+
'http://samtools.github.io/htsjdk/',
27+
ExternalDependency.MIT_LICENSE_NAME,
28+
ExternalDependency.MIT_LICENSE_URL,
29+
'A Java API for high-throughput sequencing data (HTS) formats'
30+
)
31+
)
32+
2033
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile")
2134
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
22-
external 'org.biojava:biojava3-core:3.0.7'
23-
external 'org.biojava:biojava3-genome:3.0.7'
24-
external 'org.itadaki:bzip2:0.9.1'
25-
external 'org.clojars.chapmanb:sam:1.96'
26-
external "org.apache.commons:commons-math3:${commonsMath3Version}"
35+
BuildUtils.addExternalDependency(
36+
project,
37+
new ExternalDependency(
38+
'org.biojava:biojava3-core:3.0.7',
39+
'biojava3-core',
40+
'biojava',
41+
'http://biojava.org/wiki/Main_Page',
42+
ExternalDependency.GNU_LESSER_GPL_21_NAME,
43+
ExternalDependency.GNU_LESSER_GPL_21_URL,
44+
'Java framework for processing biological data'
45+
)
46+
)
47+
48+
BuildUtils.addExternalDependency(
49+
project,
50+
new ExternalDependency(
51+
'org.biojava:biojava3-genome:3.0.7',
52+
'biojava3-genome',
53+
'biojava',
54+
'http://biojava.org/wiki/Main_Page',
55+
ExternalDependency.GNU_LESSER_GPL_21_NAME,
56+
ExternalDependency.GNU_LESSER_GPL_21_URL,
57+
'Java framework for processing biological data'
58+
)
59+
)
60+
61+
BuildUtils.addExternalDependency(
62+
project,
63+
new ExternalDependency(
64+
'org.itadaki:bzip2:0.9.1',
65+
'jbzip2',
66+
'jbzip2',
67+
'http://code.google.com/p/jbzip2/',
68+
ExternalDependency.MIT_LICENSE_NAME,
69+
ExternalDependency.MIT_LICENSE_URL,
70+
'BZIP compression/decompression library. Used by FastQC'
71+
)
72+
)
73+
74+
BuildUtils.addExternalDependency(
75+
project,
76+
new ExternalDependency(
77+
'org.clojars.chapmanb:sam:1.96',
78+
'picard tools',
79+
'picard tools',
80+
'http://sourceforge.net/projects/picard/',
81+
ExternalDependency.MIT_LICENSE_NAME,
82+
ExternalDependency.MIT_LICENSE_URL,
83+
'Library for working with SAM/BAM files. Used by FastQC'
84+
)
85+
)
2786
implementation "net.sf.opencsv:opencsv:${opencsvVersion}"
2887

2988
// picard brings in a version of servlet-api and a very old one at that, so we excluded it
3089
// Note: if changing this, we might need to match the htsjdk version set in gradle.properties
31-
external("com.github.broadinstitute:picard:2.22.4") {
32-
exclude group: "javax.servlet", module: "servlet-api"
33-
exclude group: "org.apache.commons", module: "commons-collections4"
34-
}
90+
BuildUtils.addExternalDependency(
91+
project,
92+
new ExternalDependency(
93+
"com.github.broadinstitute:picard:2.22.4",
94+
"Picard Tools Lib",
95+
"PicardTools",
96+
"https://github.com/broadinstitute/picard",
97+
ExternalDependency.APACHE_2_LICENSE_NAME,
98+
ExternalDependency.APACHE_2_LICENSE_URL,
99+
"Manipulating Sequence Data"
100+
),
101+
{
102+
exclude group: "javax.servlet", module: "servlet-api"
103+
exclude group: "org.apache.commons", module: "commons-collections4"
104+
}
105+
)
35106

36-
external "commons-net:commons-net:${commonsNetVersion}"
107+
BuildUtils.addExternalDependency(
108+
project,
109+
new ExternalDependency(
110+
"commons-net:commons-net:${commonsNetVersion}",
111+
"Commons Net",
112+
"Apache",
113+
"http://jakarta.apache.org/commons/net/",
114+
ExternalDependency.APACHE_2_LICENSE_NAME,
115+
ExternalDependency.APACHE_2_LICENSE_URL,
116+
"FTPClient used to retrieve resources from other servers (e.g., GO annotations)"
117+
)
118+
)
119+
BuildUtils.addExternalDependency(
120+
project,
121+
new ExternalDependency(
122+
"org.apache.commons:commons-math3:${commonsMath3Version}",
123+
"Commons Math",
124+
"Apache",
125+
"http://commons.apache.org/math/",
126+
ExternalDependency.APACHE_2_LICENSE_NAME,
127+
ExternalDependency.APACHE_2_LICENSE_URL,
128+
"Lightweight, self-contained mathematics and statistics components"
129+
)
130+
)
37131
apiImplementation "org.apache.commons:commons-math3:${commonsMath3Version}"
38-
external "org.apache.commons:commons-math3:${commonsMath3Version}"
39132
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "published", depExtension: "module")
40133
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
41134
}

SequenceAnalysis/resources/credits/dependencies.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

SequenceAnalysis/resources/credits/jars.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)