Separate test and demo dependency versions from main constraints

Author: emlun

build.gradle

@@ -58,21 +58,9 @@ dependencies {
     }
     api('com.google.guava:guava:[24.1.1,31)')
     api('com.upokecenter:cbor:[4.5.1,5)')
-    api('javax.ws.rs:javax.ws.rs-api:[2.1,3)')
-    api('javax.xml.bind:jaxb-api:[2.3.0,3)')
-    api('junit:junit:[4.12,5)')
-    api('org.apache.httpcomponents:httpclient:[4.5.2,5)')
     api('org.bouncycastle:bcpkix-jdk15on:[1.62,2)')
     api('org.bouncycastle:bcprov-jdk15on:[1.62,2)')
-    api('org.eclipse.jetty:jetty-servlet:[9.4.9.v20180320,10)')
-    api('org.glassfish.jersey.containers:jersey-container-servlet-core:[2.33,3)')
-    api('org.glassfish.jersey.containers:jersey-container-servlet:[2.33,3)')
-    api('org.glassfish.jersey.inject:jersey-hk2:[2.33,3)')
-    api('org.mockito:mockito-core:[2.27.0,3)')
-    api('org.scalacheck:scalacheck_2.13:[1.14.0,2)')
-    api('org.scalatest:scalatest_2.13:[3.0.8,3.1)')
     api('org.slf4j:slf4j-api:[1.7.25,2)')
-    api('uk.org.lidalia:slf4j-test:[1.1.0,2)')
   }
 }
 

settings.gradle

@@ -9,3 +9,4 @@ include ':test-dependent-projects:java-dep-webauthn-server-attestation'
 include ':test-dependent-projects:java-dep-webauthn-server-core'
 include ':test-dependent-projects:java-dep-webauthn-server-core-and-bouncycastle'
 include ':test-dependent-projects:java-dep-yubico-util'
+include ':test-platform'

test-platform/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+  id 'java-platform'
+}
+
+description = 'Dependency constraints for tests'
+
+dependencies {
+  constraints {
+    api('junit:junit:[4.12,5)')
+    api('org.apache.httpcomponents:httpclient:[4.5.2,5)')
+    api('org.mockito:mockito-core:[2.27.0,3)')
+    api('org.scalacheck:scalacheck_2.13:[1.14.0,2)')
+    api('org.scalatest:scalatest_2.13:[3.0.8,3.1)')
+    api('uk.org.lidalia:slf4j-test:[1.1.0,2)')
+  }
+}

webauthn-server-attestation/build.gradle

@@ -44,6 +44,7 @@ dependencies {
   )
 
   testImplementation(
+    platform(project(":test-platform")),
     project(':webauthn-server-core').sourceSets.test.output,
     project(':yubico-util-scala'),
     'com.fasterxml.jackson.datatype:jackson-datatype-jdk8',

webauthn-server-core/build.gradle

@@ -31,6 +31,7 @@ dependencies {
   )
 
   testImplementation(
+    platform(project(":test-platform")),
     project(':yubico-util-scala'),
     'com.fasterxml.jackson.datatype:jackson-datatype-jdk8',
     'junit:junit',

webauthn-server-demo/build.gradle

@@ -19,21 +19,24 @@ dependencies {
     'com.fasterxml.jackson.core:jackson-databind',
     'com.google.guava:guava',
     'com.upokecenter:cbor',
-    'javax.ws.rs:javax.ws.rs-api',
     'org.bouncycastle:bcprov-jdk15on',
-    'org.eclipse.jetty:jetty-server',
-    'org.eclipse.jetty:jetty-servlet',
-    'org.glassfish.jersey.containers:jersey-container-servlet-core',
     'org.slf4j:slf4j-api',
   )
 
+  implementation(
+    'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',
+    'org.glassfish.jersey.containers:jersey-container-servlet-core:2.36',
+    'javax.ws.rs:javax.ws.rs-api:2.1.1',
+  )
+
   runtimeOnly(
     'ch.qos.logback:logback-classic:1.3.0',
-    'org.glassfish.jersey.containers:jersey-container-servlet',
-    'org.glassfish.jersey.inject:jersey-hk2',
+    'org.glassfish.jersey.containers:jersey-container-servlet:2.36',
+    'org.glassfish.jersey.inject:jersey-hk2:2.36',
   )
 
   testImplementation(
+    platform(project(":test-platform")),
     project(':webauthn-server-core').sourceSets.test.output,
     project(':yubico-util-scala'),
 

yubico-util-scala/build.gradle

@@ -10,6 +10,7 @@ targetCompatibility = 1.8
 
 dependencies {
   implementation(platform(rootProject))
+  implementation(platform(project(":test-platform")))
 
   implementation(
     'org.scala-lang:scala-library',

yubico-util/build.gradle

@@ -16,6 +16,7 @@ targetCompatibility = 1.8
 
 dependencies {
   api(platform(rootProject))
+  api(platform(project(":test-platform")))
 
   api(
     'com.fasterxml.jackson.core:jackson-databind',