Skip to content

Commit cdaa2ed

Browse files
committed
Re-introduce version constraints on individual Jackson modules
1 parent e2409b5 commit cdaa2ed

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ wrapper {
3232

3333
dependencies {
3434
constraints {
35+
api(constraintLibs.bundles.jackson)
36+
api(constraintLibs.cbor)
3537
api(constraintLibs.cose)
3638
api(constraintLibs.guava)
37-
api(constraintLibs.cbor)
3839
api(constraintLibs.httpclient5)
3940
api(constraintLibs.slf4j)
4041
}

settings.gradle.kts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,25 @@ include(":test-platform")
1414
dependencyResolutionManagement {
1515
versionCatalogs {
1616
create("constraintLibs") {
17-
val jacksonVer = version("jackson", "[2.13.2.1,3)")
18-
1917
library("cbor", "com.upokecenter:cbor:[4.5.1,5)")
2018
library("cose", "com.augustcellars.cose:cose-java:[1.0.0,2)")
2119
library("guava", "com.google.guava:guava:[24.1.1,32)")
2220
library("httpclient5", "org.apache.httpcomponents.client5:httpclient5:[5.0.0,6)")
23-
library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef(jacksonVer)
2421
library("slf4j", "org.slf4j:slf4j-api:[1.7.25,3)")
22+
23+
val jacksonVer = version("jackson", "[2.13.2.1,3)")
24+
library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef(jacksonVer)
25+
library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef(jacksonVer)
26+
library("jackson-dataformat-cbor", "com.fasterxml.jackson.dataformat", "jackson-dataformat-cbor").versionRef(jacksonVer)
27+
library("jackson-datatype-jdk8", "com.fasterxml.jackson.datatype", "jackson-datatype-jdk8").versionRef(jacksonVer)
28+
library("jackson-datatype-jsr310", "com.fasterxml.jackson.datatype", "jackson-datatype-jsr310").versionRef(jacksonVer)
29+
bundle("jackson", listOf(
30+
"jackson-bom",
31+
"jackson-databind",
32+
"jackson-dataformat-cbor",
33+
"jackson-datatype-jdk8",
34+
"jackson-datatype-jsr310",
35+
))
2536
}
2637
}
2738
}

webauthn-server-attestation/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ dependencies {
3030

3131
api(project(":webauthn-server-core"))
3232

33-
implementation(platform(constraintLibs.jackson.bom))
3433
implementation(project(":yubico-util"))
3534
implementation("com.fasterxml.jackson.core:jackson-databind")
3635
implementation("org.slf4j:slf4j-api")

webauthn-server-core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ description = "Yubico WebAuthn server core API"
1515
dependencies {
1616
api(platform(rootProject))
1717

18-
implementation(platform(constraintLibs.jackson.bom))
1918
implementation(project(":yubico-util"))
2019
implementation("com.augustcellars.cose:cose-java")
2120
implementation("com.fasterxml.jackson.core:jackson-databind")

yubico-util/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616
api(platform(rootProject))
1717

1818
api("com.fasterxml.jackson.core:jackson-databind")
19-
api(platform(constraintLibs.jackson.bom))
2019

2120
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
2221
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")

0 commit comments

Comments
 (0)