Re-introduce version constraints on individual Jackson modules

Yubico · May 3, 2023 · cdaa2ed · cdaa2ed · github-actions · May 3, 2023
1 parent e2409b5
commit cdaa2ed
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,9 +32,10 @@ wrapper {
 
 dependencies {
   constraints {
+    api(constraintLibs.bundles.jackson)
+    api(constraintLibs.cbor)
     api(constraintLibs.cose)
     api(constraintLibs.guava)
-    api(constraintLibs.cbor)
     api(constraintLibs.httpclient5)
     api(constraintLibs.slf4j)
   }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,14 +14,25 @@ include(":test-platform")
 dependencyResolutionManagement {
     versionCatalogs {
         create("constraintLibs") {
-            val jacksonVer = version("jackson", "[2.13.2.1,3)")
-
             library("cbor", "com.upokecenter:cbor:[4.5.1,5)")
             library("cose", "com.augustcellars.cose:cose-java:[1.0.0,2)")
             library("guava", "com.google.guava:guava:[24.1.1,32)")
             library("httpclient5", "org.apache.httpcomponents.client5:httpclient5:[5.0.0,6)")
-            library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef(jacksonVer)
             library("slf4j", "org.slf4j:slf4j-api:[1.7.25,3)")
+
+            val jacksonVer = version("jackson", "[2.13.2.1,3)")
+            library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef(jacksonVer)
+            library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef(jacksonVer)
+            library("jackson-dataformat-cbor", "com.fasterxml.jackson.dataformat", "jackson-dataformat-cbor").versionRef(jacksonVer)
+            library("jackson-datatype-jdk8", "com.fasterxml.jackson.datatype", "jackson-datatype-jdk8").versionRef(jacksonVer)
+            library("jackson-datatype-jsr310", "com.fasterxml.jackson.datatype", "jackson-datatype-jsr310").versionRef(jacksonVer)
+            bundle("jackson", listOf(
+                "jackson-bom",
+                "jackson-databind",
+                "jackson-dataformat-cbor",
+                "jackson-datatype-jdk8",
+                "jackson-datatype-jsr310",
+            ))
         }
     }
 }
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
@@ -30,7 +30,6 @@ dependencies {
 
   api(project(":webauthn-server-core"))
 
-  implementation(platform(constraintLibs.jackson.bom))
   implementation(project(":yubico-util"))
   implementation("com.fasterxml.jackson.core:jackson-databind")
   implementation("org.slf4j:slf4j-api")

diff --git a/webauthn-server-core/build.gradle.kts b/webauthn-server-core/build.gradle.kts
@@ -15,7 +15,6 @@ description = "Yubico WebAuthn server core API"
 dependencies {
   api(platform(rootProject))
 
-  implementation(platform(constraintLibs.jackson.bom))
   implementation(project(":yubico-util"))
   implementation("com.augustcellars.cose:cose-java")
   implementation("com.fasterxml.jackson.core:jackson-databind")

diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
   api(platform(rootProject))
 
   api("com.fasterxml.jackson.core:jackson-databind")
-  api(platform(constraintLibs.jackson.bom))
 
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
Package	Coverage	Stats	Prev	Prev
Overall	81 % 🔹	1267 🔺 / 1559 🔹	81 %	1266 / 1559
`com.yubico.fido.metadata`	68 % 🔹	219 🔺 / 318 🔹	68 %	218 / 318
`com.yubico.internal.util`	47 % 🔹	57 🔹 / 120 🔹	47 %	57 / 120
`com.yubico.webauthn`	87 % 🔹	558 🔹 / 637 🔹	87 %	558 / 637
`com.yubico.webauthn.attestation`	92 % 🔹	13 🔹 / 14 🔹	92 %	13 / 14
`com.yubico.webauthn.data`	93 % 🔹	395 🔹 / 423 🔹	93 %	395 / 423
`com.yubico.webauthn.extension.appid`	100 % 🏆	13 🔹 / 13 🔹	100 %	13 / 13
`com.yubico.webauthn.extension.uvm`	50 % 🔹	12 🔹 / 24 🔹	50 %	12 / 24
`com.yubico.webauthn.meta`	0 % 🔹	0 🔹 / 10 🔹	0 %	0 / 10