Declare all dependency versions centrally in root project

emlun · emlun · commit f3104937ea9a · 2019-10-17T14:19:12.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -48,6 +48,34 @@ allprojects {
   }
 }
 
+Map<String, String> dependencyVersions = [
+  'ch.qos.logback:logback-classic:1.2.3',
+  'com.augustcellars.cose:cose-java:1.0.0',
+  'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
+  'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9',
+  'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
+  'com.google.guava:guava:19.0',
+  'com.upokecenter:cbor:4.0.1',
+  'javax.activation:activation:1.1.1',
+  'javax.ws.rs:javax.ws.rs-api:2.1',
+  'javax.xml.bind:jaxb-api:2.3.0',
+  'junit:junit:4.12',
+  'org.apache.httpcomponents:httpclient:4.5.2',
+  'org.bouncycastle:bcpkix-jdk15on:1.62',
+  'org.bouncycastle:bcprov-jdk15on:1.62',
+  'org.eclipse.jetty:jetty-server:9.4.9.v20180320',
+  'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',
+  'org.glassfish.jersey.containers:jersey-container-servlet-core:2.26',
+  'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
+  'org.glassfish.jersey.inject:jersey-hk2:2.26',
+  'org.mockito:mockito-core:2.27.0',
+  'org.scala-lang:scala-library:2.12.8',
+  'org.scalacheck:scalacheck_2.12:1.14.0',
+  'org.scalatest:scalatest_2.12:3.0.4',
+  'org.slf4j:slf4j-api:1.7.25',
+].collectEntries { [(it.split(':')[0..1].join(':')): it] }
+rootProject.ext.addVersion = { dep -> dependencyVersions[dep] }
+
 subprojects {
   apply plugin: LombokPlugin
 
diff --git a/webauthn-server-attestation/build.gradle b/webauthn-server-attestation/build.gradle
@@ -17,24 +17,24 @@ dependencies {
 
   implementation(
     project(':yubico-util'),
-    'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
-    'com.google.guava:guava:19.0',
-    'org.bouncycastle:bcprov-jdk15on:1.62',
-    'org.slf4j:slf4j-api:1.7.25',
+    addVersion('com.google.guava:guava'),
+    addVersion('com.fasterxml.jackson.core:jackson-databind'),
+    addVersion('org.bouncycastle:bcprov-jdk15on'),
+    addVersion('org.slf4j:slf4j-api'),
   )
 
   testImplementation(
     project(':webauthn-server-core').sourceSets.test.output,
     project(':yubico-util-scala'),
-    'junit:junit:4.12',
-    'org.mockito:mockito-core:2.27.0',
-    'org.scala-lang:scala-library:2.12.8',
-    'org.scalacheck:scalacheck_2.12:1.14.0',
-    'org.scalatest:scalatest_2.12:3.0.4',
+    addVersion('junit:junit'),
+    addVersion('org.mockito:mockito-core'),
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.12'),
+    addVersion('org.scalatest:scalatest_2.12'),
   )
   testRuntimeOnly(
     // Transitive dependency from :webauthn-server-core:test
-    'org.bouncycastle:bcpkix-jdk15on:1.62',
+    addVersion('org.bouncycastle:bcpkix-jdk15on'),
   )
 }
 
diff --git a/webauthn-server-core/build.gradle b/webauthn-server-core/build.gradle
@@ -15,24 +15,24 @@ dependencies {
   )
 
   implementation(
-    'com.augustcellars.cose:cose-java:1.0.0',
-    'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
-    'com.google.guava:guava:19.0',
-    'com.upokecenter:cbor:4.0.1',
-    'org.apache.httpcomponents:httpclient:4.5.2',
-    'org.bouncycastle:bcprov-jdk15on:1.62',
-    'org.slf4j:slf4j-api:1.7.25',
+    addVersion('com.augustcellars.cose:cose-java'),
+    addVersion('com.google.guava:guava'),
+    addVersion('com.fasterxml.jackson.core:jackson-databind'),
+    addVersion('com.upokecenter:cbor'),
+    addVersion('org.apache.httpcomponents:httpclient'),
+    addVersion('org.bouncycastle:bcprov-jdk15on'),
+    addVersion('org.slf4j:slf4j-api'),
   )
 
   testImplementation(
     project(':yubico-util-scala'),
-    'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
-    'junit:junit:4.12',
-    'org.bouncycastle:bcpkix-jdk15on:1.62',
-    'org.mockito:mockito-core:2.27.0',
-    'org.scala-lang:scala-library:2.12.8',
-    'org.scalacheck:scalacheck_2.12:1.14.0',
-    'org.scalatest:scalatest_2.12:3.0.4',
+    addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
+    addVersion('junit:junit'),
+    addVersion('org.bouncycastle:bcpkix-jdk15on'),
+    addVersion('org.mockito:mockito-core'),
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.12'),
+    addVersion('org.scalatest:scalatest_2.12'),
   )
 
 }
diff --git a/webauthn-server-demo/build.gradle b/webauthn-server-demo/build.gradle
@@ -24,38 +24,38 @@ dependencies {
     project(':webauthn-server-core'),
     project(':yubico-util'),
 
-    'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
-    'com.google.guava:guava:19.0',
-    'com.upokecenter:cbor:4.0.1',
-    'javax.ws.rs:javax.ws.rs-api:2.1',
-    'org.eclipse.jetty:jetty-server:9.4.9.v20180320',
-    'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',
-    'org.glassfish.jersey.containers:jersey-container-servlet-core:2.26',
-    'org.slf4j:slf4j-api:1.7.25',
+    addVersion('com.google.guava:guava'),
+    addVersion('com.fasterxml.jackson.core:jackson-databind'),
+    addVersion('com.upokecenter:cbor'),
+    addVersion('javax.ws.rs:javax.ws.rs-api'),
+    addVersion('org.eclipse.jetty:jetty-server'),
+    addVersion('org.eclipse.jetty:jetty-servlet'),
+    addVersion('org.glassfish.jersey.containers:jersey-container-servlet-core'),
+    addVersion('org.slf4j:slf4j-api'),
   )
 
   forJdk10(
-    'javax.activation:activation:1.1.1',
-    'javax.xml.bind:jaxb-api:2.3.0',
+    addVersion('javax.activation:activation'),
+    addVersion('javax.xml.bind:jaxb-api'),
   )
 
   runtimeOnly(
     configurations.forJdk10,
 
-    'ch.qos.logback:logback-classic:1.2.3',
-    'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
-    'org.glassfish.jersey.inject:jersey-hk2:2.26',
+    addVersion('ch.qos.logback:logback-classic'),
+    addVersion('org.glassfish.jersey.containers:jersey-container-servlet'),
+    addVersion('org.glassfish.jersey.inject:jersey-hk2'),
   )
 
   testImplementation(
     project(':webauthn-server-core').sourceSets.test.output,
     project(':yubico-util-scala'),
 
-    'junit:junit:4.12',
-    'org.mockito:mockito-core:2.27.0',
-    'org.scala-lang:scala-library:2.12.8',
-    'org.scalacheck:scalacheck_2.12:1.14.0',
-    'org.scalatest:scalatest_2.12:3.0.4',
+    addVersion('junit:junit'),
+    addVersion('org.mockito:mockito-core'),
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.12'),
+    addVersion('org.scalatest:scalatest_2.12'),
   )
 
   modules {
diff --git a/yubico-util-scala/build.gradle b/yubico-util-scala/build.gradle
@@ -7,12 +7,12 @@ description = 'Yubico internal Scala utilities'
 dependencies {
 
   implementation(
-    'org.scala-lang:scala-library:2.12.8',
-    'org.scalacheck:scalacheck_2.12:1.14.0',
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.12'),
   )
 
   testImplementation(
-    'org.scalatest:scalatest_2.12:3.0.4',
+    addVersion('org.scalatest:scalatest_2.12'),
   )
 }
 
diff --git a/yubico-util/build.gradle b/yubico-util/build.gradle
@@ -10,23 +10,23 @@ project.ext.publishMe = true
 dependencies {
 
   api(
-    'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
+    addVersion('com.fasterxml.jackson.core:jackson-databind'),
   )
 
   implementation(
-    'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9',
-    'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
-    'com.upokecenter:cbor:4.0.1',
-    'org.bouncycastle:bcprov-jdk15on:1.62',
-    'org.slf4j:slf4j-api:1.7.25',
+    addVersion('com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'),
+    addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
+    addVersion('com.upokecenter:cbor'),
+    addVersion('org.bouncycastle:bcprov-jdk15on'),
+    addVersion('org.slf4j:slf4j-api'),
   )
 
   testImplementation(
     project(':yubico-util-scala'),
-    'junit:junit:4.12',
-    'org.scala-lang:scala-library:2.12.8',
-    'org.scalacheck:scalacheck_2.12:1.14.0',
-    'org.scalatest:scalatest_2.12:3.0.4',
+    addVersion('junit:junit'),
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.12'),
+    addVersion('org.scalatest:scalatest_2.12'),
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ description = 'Yubico internal Scala utilities'`
`7`	`7`	`dependencies {`
`8`	`8`
`9`	`9`	`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'),`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`testImplementation(`
`15`		`- 'org.scalatest:scalatest_2.12:3.0.4',`
	`15`	`+ addVersion('org.scalatest:scalatest_2.12'),`
`16`	`16`	`)`
`17`	`17`	`}`
`18`	`18`