Skip to content

Commit f310493

Browse files
emlunemlun
committed
Declare all dependency versions centrally in root project
1 parent e513499 commit f310493

File tree

6 files changed

+83
-55
lines changed

6 files changed

+83
-55
lines changed

‎build.gradle‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,34 @@ allprojects {
4848
}
4949
}
5050

51+
Map<String, String> dependencyVersions = [
52+
'ch.qos.logback:logback-classic:1.2.3',
53+
'com.augustcellars.cose:cose-java:1.0.0',
54+
'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
55+
'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9',
56+
'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
57+
'com.google.guava:guava:19.0',
58+
'com.upokecenter:cbor:4.0.1',
59+
'javax.activation:activation:1.1.1',
60+
'javax.ws.rs:javax.ws.rs-api:2.1',
61+
'javax.xml.bind:jaxb-api:2.3.0',
62+
'junit:junit:4.12',
63+
'org.apache.httpcomponents:httpclient:4.5.2',
64+
'org.bouncycastle:bcpkix-jdk15on:1.62',
65+
'org.bouncycastle:bcprov-jdk15on:1.62',
66+
'org.eclipse.jetty:jetty-server:9.4.9.v20180320',
67+
'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',
68+
'org.glassfish.jersey.containers:jersey-container-servlet-core:2.26',
69+
'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
70+
'org.glassfish.jersey.inject:jersey-hk2:2.26',
71+
'org.mockito:mockito-core:2.27.0',
72+
'org.scala-lang:scala-library:2.12.8',
73+
'org.scalacheck:scalacheck_2.12:1.14.0',
74+
'org.scalatest:scalatest_2.12:3.0.4',
75+
'org.slf4j:slf4j-api:1.7.25',
76+
].collectEntries { [(it.split(':')[0..1].join(':')): it] }
77+
rootProject.ext.addVersion = { dep -> dependencyVersions[dep] }
78+
5179
subprojects {
5280
apply plugin: LombokPlugin
5381

‎webauthn-server-attestation/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ dependencies {
1717

1818
implementation(
1919
project(':yubico-util'),
20-
'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
21-
'com.google.guava:guava:19.0',
22-
'org.bouncycastle:bcprov-jdk15on:1.62',
23-
'org.slf4j:slf4j-api:1.7.25',
20+
addVersion('com.google.guava:guava'),
21+
addVersion('com.fasterxml.jackson.core:jackson-databind'),
22+
addVersion('org.bouncycastle:bcprov-jdk15on'),
23+
addVersion('org.slf4j:slf4j-api'),
2424
)
2525

2626
testImplementation(
2727
project(':webauthn-server-core').sourceSets.test.output,
2828
project(':yubico-util-scala'),
29-
'junit:junit:4.12',
30-
'org.mockito:mockito-core:2.27.0',
31-
'org.scala-lang:scala-library:2.12.8',
32-
'org.scalacheck:scalacheck_2.12:1.14.0',
33-
'org.scalatest:scalatest_2.12:3.0.4',
29+
addVersion('junit:junit'),
30+
addVersion('org.mockito:mockito-core'),
31+
addVersion('org.scala-lang:scala-library'),
32+
addVersion('org.scalacheck:scalacheck_2.12'),
33+
addVersion('org.scalatest:scalatest_2.12'),
3434
)
3535
testRuntimeOnly(
3636
// Transitive dependency from :webauthn-server-core:test
37-
'org.bouncycastle:bcpkix-jdk15on:1.62',
37+
addVersion('org.bouncycastle:bcpkix-jdk15on'),
3838
)
3939
}
4040

‎webauthn-server-core/build.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ dependencies {
1515
)
1616

1717
implementation(
18-
'com.augustcellars.cose:cose-java:1.0.0',
19-
'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
20-
'com.google.guava:guava:19.0',
21-
'com.upokecenter:cbor:4.0.1',
22-
'org.apache.httpcomponents:httpclient:4.5.2',
23-
'org.bouncycastle:bcprov-jdk15on:1.62',
24-
'org.slf4j:slf4j-api:1.7.25',
18+
addVersion('com.augustcellars.cose:cose-java'),
19+
addVersion('com.google.guava:guava'),
20+
addVersion('com.fasterxml.jackson.core:jackson-databind'),
21+
addVersion('com.upokecenter:cbor'),
22+
addVersion('org.apache.httpcomponents:httpclient'),
23+
addVersion('org.bouncycastle:bcprov-jdk15on'),
24+
addVersion('org.slf4j:slf4j-api'),
2525
)
2626

2727
testImplementation(
2828
project(':yubico-util-scala'),
29-
'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
30-
'junit:junit:4.12',
31-
'org.bouncycastle:bcpkix-jdk15on:1.62',
32-
'org.mockito:mockito-core:2.27.0',
33-
'org.scala-lang:scala-library:2.12.8',
34-
'org.scalacheck:scalacheck_2.12:1.14.0',
35-
'org.scalatest:scalatest_2.12:3.0.4',
29+
addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
30+
addVersion('junit:junit'),
31+
addVersion('org.bouncycastle:bcpkix-jdk15on'),
32+
addVersion('org.mockito:mockito-core'),
33+
addVersion('org.scala-lang:scala-library'),
34+
addVersion('org.scalacheck:scalacheck_2.12'),
35+
addVersion('org.scalatest:scalatest_2.12'),
3636
)
3737

3838
}

‎webauthn-server-demo/build.gradle‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,38 @@ dependencies {
2424
project(':webauthn-server-core'),
2525
project(':yubico-util'),
2626

27-
'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
28-
'com.google.guava:guava:19.0',
29-
'com.upokecenter:cbor:4.0.1',
30-
'javax.ws.rs:javax.ws.rs-api:2.1',
31-
'org.eclipse.jetty:jetty-server:9.4.9.v20180320',
32-
'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',
33-
'org.glassfish.jersey.containers:jersey-container-servlet-core:2.26',
34-
'org.slf4j:slf4j-api:1.7.25',
27+
addVersion('com.google.guava:guava'),
28+
addVersion('com.fasterxml.jackson.core:jackson-databind'),
29+
addVersion('com.upokecenter:cbor'),
30+
addVersion('javax.ws.rs:javax.ws.rs-api'),
31+
addVersion('org.eclipse.jetty:jetty-server'),
32+
addVersion('org.eclipse.jetty:jetty-servlet'),
33+
addVersion('org.glassfish.jersey.containers:jersey-container-servlet-core'),
34+
addVersion('org.slf4j:slf4j-api'),
3535
)
3636

3737
forJdk10(
38-
'javax.activation:activation:1.1.1',
39-
'javax.xml.bind:jaxb-api:2.3.0',
38+
addVersion('javax.activation:activation'),
39+
addVersion('javax.xml.bind:jaxb-api'),
4040
)
4141

4242
runtimeOnly(
4343
configurations.forJdk10,
4444

45-
'ch.qos.logback:logback-classic:1.2.3',
46-
'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
47-
'org.glassfish.jersey.inject:jersey-hk2:2.26',
45+
addVersion('ch.qos.logback:logback-classic'),
46+
addVersion('org.glassfish.jersey.containers:jersey-container-servlet'),
47+
addVersion('org.glassfish.jersey.inject:jersey-hk2'),
4848
)
4949

5050
testImplementation(
5151
project(':webauthn-server-core').sourceSets.test.output,
5252
project(':yubico-util-scala'),
5353

54-
'junit:junit:4.12',
55-
'org.mockito:mockito-core:2.27.0',
56-
'org.scala-lang:scala-library:2.12.8',
57-
'org.scalacheck:scalacheck_2.12:1.14.0',
58-
'org.scalatest:scalatest_2.12:3.0.4',
54+
addVersion('junit:junit'),
55+
addVersion('org.mockito:mockito-core'),
56+
addVersion('org.scala-lang:scala-library'),
57+
addVersion('org.scalacheck:scalacheck_2.12'),
58+
addVersion('org.scalatest:scalatest_2.12'),
5959
)
6060

6161
modules {

‎yubico-util-scala/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ description = 'Yubico internal Scala utilities'
77
dependencies {
88

99
implementation(
10-
'org.scala-lang:scala-library:2.12.8',
11-
'org.scalacheck:scalacheck_2.12:1.14.0',
10+
addVersion('org.scala-lang:scala-library'),
11+
addVersion('org.scalacheck:scalacheck_2.12'),
1212
)
1313

1414
testImplementation(
15-
'org.scalatest:scalatest_2.12:3.0.4',
15+
addVersion('org.scalatest:scalatest_2.12'),
1616
)
1717
}
1818

‎yubico-util/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ project.ext.publishMe = true
1010
dependencies {
1111

1212
api(
13-
'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
13+
addVersion('com.fasterxml.jackson.core:jackson-databind'),
1414
)
1515

1616
implementation(
17-
'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9',
18-
'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
19-
'com.upokecenter:cbor:4.0.1',
20-
'org.bouncycastle:bcprov-jdk15on:1.62',
21-
'org.slf4j:slf4j-api:1.7.25',
17+
addVersion('com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'),
18+
addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
19+
addVersion('com.upokecenter:cbor'),
20+
addVersion('org.bouncycastle:bcprov-jdk15on'),
21+
addVersion('org.slf4j:slf4j-api'),
2222
)
2323

2424
testImplementation(
2525
project(':yubico-util-scala'),
26-
'junit:junit:4.12',
27-
'org.scala-lang:scala-library:2.12.8',
28-
'org.scalacheck:scalacheck_2.12:1.14.0',
29-
'org.scalatest:scalatest_2.12:3.0.4',
26+
addVersion('junit:junit'),
27+
addVersion('org.scala-lang:scala-library'),
28+
addVersion('org.scalacheck:scalacheck_2.12'),
29+
addVersion('org.scalatest:scalatest_2.12'),
3030
)
3131
}
3232

0 commit comments

Comments
 (0)