Skip to content

Commit ebf94a6

Browse files
committed
deps(gradle): Use Jackson's Maven BOM as a version catalog
Use a Gradle plugin [1] to generate a Gradle version catalog from a Maven BOM. This allows to ease version management for Jackson which publishes a Maven BOM, but no Gradle version catalog. [1]: https://github.com/austinarbor/version-catalog-generator Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 7e67e38 commit ebf94a6

File tree

18 files changed

+52
-40
lines changed

18 files changed

+52
-40
lines changed

cli-helper/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dependencies {
4242
implementation(projects.utils.configUtils)
4343
implementation(projects.utils.ortUtils)
4444

45+
implementation(jacksonLibs.jacksonModuleKotlin)
4546
implementation(libs.clikt)
4647
implementation(libs.commonsCompress)
47-
implementation(libs.jackson.module.kotlin)
4848
implementation(libs.jslt)
4949
implementation(libs.log4j.api)
5050
implementation(libs.slf4j)

clients/fossid-webapp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
api(libs.okhttp)
2727
api(libs.retrofit)
2828

29-
implementation(libs.jackson.module.kotlin)
29+
implementation(jacksonLibs.jacksonModuleKotlin)
3030
implementation(libs.kotlinx.coroutines)
3131
implementation(libs.retrofit.converter.jackson)
3232

gradle/libs.versions.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,7 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
113113
hikari = { module = "com.zaxxer:HikariCP", version.ref = "hikari" }
114114
hoplite-core = { module = "com.sksamuel.hoplite:hoplite-core", version.ref = "hoplite" }
115115
hoplite-yaml = { module = "com.sksamuel.hoplite:hoplite-yaml", version.ref = "hoplite" }
116-
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
117-
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
118-
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
119-
jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
120-
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
121-
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
116+
jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" }
122117
jakartaMail = { module = "com.sun.mail:jakarta.mail", version.ref = "jakartaMail" }
123118
jerseyCommon = { module = "org.glassfish.jersey.core:jersey-common", version.ref = "jerseyCommon" }
124119
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }

model/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ dependencies {
3131
api(projects.utils.ortUtils)
3232
api(projects.utils.spdxUtils)
3333

34-
api(libs.jackson.databind)
35-
api(libs.jackson.dataformat.yaml)
34+
api(jacksonLibs.jacksonDatabind)
35+
api(jacksonLibs.jacksonDataformatYaml)
3636
api(libs.log4j.api)
3737

38+
implementation(jacksonLibs.jacksonDatatypeJsr310)
39+
implementation(jacksonLibs.jacksonModuleKotlin)
3840
implementation(libs.bundles.exposed)
3941
implementation(libs.bundles.hoplite)
4042
implementation(libs.hikari)
41-
implementation(libs.jackson.datatype.jsr310)
42-
implementation(libs.jackson.module.kotlin)
4343
implementation(libs.postgres)
4444
implementation(libs.semver4j)
4545
implementation(libs.tika)

plugins/api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ plugins {
2525
dependencies {
2626
api(projects.utils.commonUtils)
2727

28-
api(libs.jackson.annotations)
28+
api(jacksonLibs.jacksonAnnotations)
2929
}

plugins/commands/api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ dependencies {
3030

3131
implementation(projects.utils.ortUtils)
3232

33-
implementation(libs.jackson.core)
34-
implementation(libs.jackson.databind)
33+
implementation(jacksonLibs.jacksonCore)
34+
implementation(jacksonLibs.jacksonDatabind)
3535
}

plugins/commands/compare/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies {
3030
implementation(projects.model)
3131
implementation(projects.utils.commonUtils)
3232

33+
implementation(jacksonLibs.jacksonDataformatYaml)
34+
implementation(jacksonLibs.jacksonModuleKotlin)
3335
implementation(libs.clikt)
3436
implementation(libs.diffUtils)
35-
implementation(libs.jackson.dataformat.yaml)
36-
implementation(libs.jackson.module.kotlin)
3737
}

plugins/commands/config/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies {
3030
implementation(projects.model)
3131
implementation(projects.utils.commonUtils)
3232

33+
implementation(jacksonLibs.jacksonDatabind)
34+
implementation(jacksonLibs.jacksonDataformatYaml)
35+
implementation(jacksonLibs.jacksonModuleKotlin)
3336
implementation(libs.clikt)
34-
implementation(libs.jackson.databind)
35-
implementation(libs.jackson.dataformat.yaml)
36-
implementation(libs.jackson.module.kotlin)
3737
}

plugins/commands/migrate/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ dependencies {
3131
implementation(projects.plugins.packageManagers.nugetPackageManager)
3232
implementation(projects.utils.commonUtils)
3333

34+
implementation(jacksonLibs.jacksonModuleKotlin)
3435
implementation(libs.clikt)
35-
implementation(libs.jackson.module.kotlin)
3636
}

plugins/package-managers/node/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
because("This is a CommandLineTool.")
3737
}
3838

39-
api(libs.jackson.databind)
39+
api(jacksonLibs.jacksonDatabind)
4040

4141
implementation(projects.downloader)
4242
implementation(projects.utils.ortUtils)

0 commit comments

Comments
 (0)