Skip to content

Commit 94b6f6e

Browse files
bbimberbbimber
committed
Convert external dependencies to BuildUtils.addExternalDependency()
1 parent c793392 commit 94b6f6e

File tree

8 files changed

+102
-95
lines changed

8 files changed

+102
-95
lines changed

‎OpenLdapSync/build.gradle‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
import org.labkey.gradle.util.BuildUtils;
2+
import org.labkey.gradle.util.ExternalDependency
3+
14
dependencies {
2-
external "org.apache.directory.api:api-all:${apacheDirectoryVersion}"
5+
BuildUtils.addExternalDependency(
6+
project,
7+
new ExternalDependency(
8+
"org.apache.directory.api:api-all:${apacheDirectoryVersion}",
9+
'Apache Directory',
10+
'Apache Directory',
11+
'http://directory.apache.org/',
12+
ExternalDependency.APACHE_2_LICENSE_NAME,
13+
ExternalDependency.APACHE_2_LICENSE_URL,
14+
'Used by LDAP Sync'
15+
)
16+
)
317
}

‎OpenLdapSync/resources/credits/dependencies.txt‎

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

‎OpenLdapSync/resources/credits/jars.txt‎

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

‎omerointegration/build.gradle‎

Lines changed: 87 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,98 @@
11
import org.labkey.gradle.util.BuildUtils;
2+
import org.labkey.gradle.util.ExternalDependency
23

34
repositories {
4-
mavenLocal()
5-
mavenCentral()
6-
maven {
7-
url 'https://artifacts.openmicroscopy.org/artifactory/maven/'
8-
}
9-
maven {
10-
url 'https://artifacts.glencoesoftware.com/artifactory/repo/'
11-
}
5+
mavenLocal()
6+
mavenCentral()
7+
maven {
8+
url 'https://artifacts.openmicroscopy.org/artifactory/maven/'
9+
}
10+
maven {
11+
url 'https://artifacts.glencoesoftware.com/artifactory/repo/'
12+
}
1213
}
1314

1415

1516
//excludes based on: https://github.com/glencoesoftware/omero-ms-core/blob/master/build.gradle
1617
dependencies {
17-
external (group: 'org.openmicroscopy', name: 'omero-gateway', version: '5.6.3')
18-
{
19-
exclude group: 'OME'
20-
exclude group: 'antlr'
21-
exclude group: 'asm'
22-
exclude group: 'backport-util-concurrent'
23-
exclude group: 'batik'
24-
exclude group: 'cglib'
25-
exclude group: 'ch.qos.logback', module: 'logback-classic'
26-
// added to prevent excessively verbose global logging
27-
exclude group: 'com.codahale.metrics'
28-
exclude group: 'com.drewnoakes'
29-
exclude group: 'com.esotericsoftware.kryo'
30-
exclude group: 'com.google.guava'
31-
exclude group: 'com.jamonapi'
32-
exclude group: 'com.mortennobel'
33-
exclude group: 'com.sun.activation', module: 'javax.activation'
34-
exclude group: 'com.zeroc', module: 'freeze'
35-
exclude group: 'com.zeroc', module: 'icefreeze'
36-
exclude group: 'com.zeroc', module: 'icegrid'
37-
exclude group: 'com.zeroc', module: 'icestorm'
38-
exclude group: 'commons-beanutils'
39-
exclude group: 'commons-codec'
40-
exclude group: 'commons-collections'
41-
exclude group: 'commons-io'
42-
exclude group: 'commons-pool'
43-
exclude group: 'dom4j'
44-
exclude group: 'edu.ucar'
45-
exclude group: 'freemarker'
46-
exclude group: 'geronimo-spec'
47-
exclude group: 'gnu.getopt'
48-
exclude group: 'javassist'
49-
exclude group: 'javax.jts'
50-
exclude group: 'joda-time'
51-
exclude group: 'net.sf.ehcache'
52-
exclude group: 'ome', module: 'formats-gpl'
53-
exclude group: 'ome', module: 'jai_imageio'
54-
exclude group: 'ome', module: 'lwf-stubs'
55-
exclude group: 'ome', module: 'turbojpeg'
56-
exclude group: 'omero', module: 'dsl'
57-
exclude group: 'omero', module: 'omero-shares'
58-
exclude group: 'org.apache.lucene'
59-
exclude group: 'org.apache.httpcomponents'
60-
exclude group: 'org.codehaus.btm'
61-
exclude group: 'org.hibernate'
62-
exclude group: 'org.hibernate.javax.persistence'
63-
exclude group: 'org.ini4j'
64-
exclude group: "org.json", module: "json"
65-
exclude group: 'org.postgresql'
66-
exclude group: 'org.scijava'
67-
exclude group: 'org.subethamail'
68-
exclude group: 'pdfbox'
69-
exclude group: 'quartz'
70-
exclude group: 'xerces'
71-
exclude group: 'xalan'
72-
exclude group: 'xml-apis'
73-
exclude group: 'zeroc', module: 'ice-db'
18+
BuildUtils.addExternalDependency(
19+
project,
20+
new ExternalDependency(
21+
"org.openmicroscopy:omero-gateway:5.6.3",
22+
"OMERO Client",
23+
"OMERO Client",
24+
"https://docs.openmicroscopy.org/omero/5.6.3/developers/Java.html",
25+
ExternalDependency.GNU_LESSER_GPL_21_NAME,
26+
ExternalDependency.GNU_LESSER_GPL_21_URL,
27+
"Used to interact with OMERO Servers"
28+
),
29+
{
30+
exclude group: 'OME'
31+
exclude group: 'antlr'
32+
exclude group: 'asm'
33+
exclude group: 'backport-util-concurrent'
34+
exclude group: 'batik'
35+
exclude group: 'cglib'
36+
exclude group: 'ch.qos.logback', module: 'logback-classic'
37+
// added to prevent excessively verbose global logging
38+
exclude group: 'com.codahale.metrics'
39+
exclude group: 'com.drewnoakes'
40+
exclude group: 'com.esotericsoftware.kryo'
41+
exclude group: 'com.google.guava'
42+
exclude group: 'com.jamonapi'
43+
exclude group: 'com.mortennobel'
44+
exclude group: 'com.sun.activation', module: 'javax.activation'
45+
exclude group: 'com.zeroc', module: 'freeze'
46+
exclude group: 'com.zeroc', module: 'icefreeze'
47+
exclude group: 'com.zeroc', module: 'icegrid'
48+
exclude group: 'com.zeroc', module: 'icestorm'
49+
exclude group: 'commons-beanutils'
50+
exclude group: 'commons-codec'
51+
exclude group: 'commons-collections'
52+
exclude group: 'commons-io'
53+
exclude group: 'commons-pool'
54+
exclude group: 'dom4j'
55+
exclude group: 'edu.ucar'
56+
exclude group: 'freemarker'
57+
exclude group: 'geronimo-spec'
58+
exclude group: 'gnu.getopt'
59+
exclude group: 'javassist'
60+
exclude group: 'javax.jts'
61+
exclude group: 'joda-time'
62+
exclude group: 'net.sf.ehcache'
63+
exclude group: 'ome', module: 'formats-gpl'
64+
exclude group: 'ome', module: 'jai_imageio'
65+
exclude group: 'ome', module: 'lwf-stubs'
66+
exclude group: 'ome', module: 'turbojpeg'
67+
exclude group: 'omero', module: 'dsl'
68+
exclude group: 'omero', module: 'omero-shares'
69+
exclude group: 'org.apache.lucene'
70+
exclude group: 'org.apache.httpcomponents'
71+
exclude group: 'org.codehaus.btm'
72+
exclude group: 'org.hibernate'
73+
exclude group: 'org.hibernate.javax.persistence'
74+
exclude group: 'org.ini4j'
75+
exclude group: "org.json", module: "json"
76+
exclude group: 'org.postgresql'
77+
exclude group: 'org.scijava'
78+
exclude group: 'org.subethamail'
79+
exclude group: 'pdfbox'
80+
exclude group: 'quartz'
81+
exclude group: 'xerces'
82+
exclude group: 'xalan'
83+
exclude group: 'xml-apis'
84+
exclude group: 'zeroc', module: 'ice-db'
7485

75-
exclude group: 'org.springframework', module: 'spring-aop'
76-
exclude group: 'org.springframework', module: 'spring-context'
77-
exclude group: 'org.springframework', module: 'spring-expression'
78-
exclude group: 'org.springframework', module: 'spring-core'
79-
exclude group: 'org.springframework', module: 'spring-beans'
80-
exclude group: 'org.springframework', module: 'spring-jdbc'
81-
exclude group: 'org.springframework', module: 'spring-tx'
82-
}
86+
exclude group: 'org.springframework', module: 'spring-aop'
87+
exclude group: 'org.springframework', module: 'spring-context'
88+
exclude group: 'org.springframework', module: 'spring-expression'
89+
exclude group: 'org.springframework', module: 'spring-core'
90+
exclude group: 'org.springframework', module: 'spring-beans'
91+
exclude group: 'org.springframework', module: 'spring-jdbc'
92+
exclude group: 'org.springframework', module: 'spring-tx'
93+
}
94+
)
95+
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
8396

84-
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
85-
86-
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
97+
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "published", depExtension: "module")
8798
}

‎omerointegration/resources/credits/dependencies.txt‎

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

‎omerointegration/resources/credits/jars.txt‎

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

‎singlecell/resources/credits/dependencies.txt‎

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

‎singlecell/resources/credits/jars.txt‎

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

0 commit comments

Comments
 (0)