DEPENDENCIES

eclipse-edc · Mar 29, 2024 · 966196a · 966196a
1 parent 2ff0a44
commit 966196a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -35,7 +35,6 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.0, Apache-2.0, approved, #14161
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.0, Apache-2.0, approved, #4699
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.1, Apache-2.0, approved, #7930
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.0, Apache-2.0, approved, #14160
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.17.0, , restricted, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.15.1, Apache-2.0, approved, #9236

diff --git a/core/common/lib/json-ld-lib/build.gradle.kts b/core/common/lib/json-ld-lib/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.jakartaJson)
-    api(libs.jacksonJsonP)
+    api(libs.jackson.datatype.jakarta.jsonp)
     api(libs.titaniumJsonLd)
 
     implementation(project(":spi:common:core-spi"))

diff --git a/extensions/common/http/jersey-core/build.gradle.kts b/extensions/common/http/jersey-core/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
     testFixturesApi(project(":extensions:common:json-ld"))
     testFixturesImplementation(project(":extensions:common:lib:jersey-providers-lib"))
     testFixturesApi(libs.jakarta.rsApi)
-    testFixturesApi(libs.jacksonJsonP)
+    testFixturesApi(libs.jackson.datatype.jakarta.jsonp)
     testFixturesApi(libs.junit.jupiter.api)
     testFixturesApi(libs.mockito.core)
 }

diff --git a/extensions/common/json-ld/build.gradle.kts b/extensions/common/json-ld/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 dependencies {
     api(libs.jakartaJson)
-    api(libs.jacksonJsonP)
+    api(libs.jackson.datatype.jakarta.jsonp)
     api(libs.titaniumJsonLd)
 
     api(project(":spi:common:core-spi"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ h2 = "2.2.224"
 httpMockServer = "5.15.0"
 jakarta-json = "2.0.1"
 jakarta-transaction = "2.0.1"
-jackson = "2.17.0"
+jackson = "2.16.2"
 jersey = "3.1.5"
 jetbrainsAnnotation = "24.1.0"
 jetty = "11.0.20"
@@ -51,11 +51,8 @@ failsafe-core = { module = "dev.failsafe:failsafe", version.ref = "failsafe" }
 failsafe-okhttp = { module = "dev.failsafe:failsafe-okhttp", version.ref = "failsafe" }
 h2 = { module = "com.h2database:h2", version.ref = "h2" }
 jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
-jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
-jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" }
-jackson-datatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
-jacksonJsonP = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp", version.ref = "jackson" }
+jackson-datatype-jakarta-jsonp = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp", version.ref = "jackson" }
 jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
 jakarta-transaction-api = { module = "jakarta.transaction:jakarta.transaction-api", version.ref = "jakarta-transaction" }
 jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
@@ -104,7 +101,6 @@ kafkaClients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafka
 
 [bundles]
 jersey-core = ["jersey.server", "jersey.common", "jersey.jackson", "jersey.multipart", "jersey.inject", "jersey.servlet", "jersey.servletcore"]
-jackson = ["jackson.core", "jackson.annotations", "jackson.databind", "jackson-datatypeJsr310"]
 jupiter = ["junit-jupiter-api", "junit-jupiter-params"]
 
 [plugins]

diff --git a/spi/common/core-spi/build.gradle.kts b/spi/common/core-spi/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
 }
 
 dependencies {
-    api(libs.bundles.jackson)
     api(libs.edc.runtime.metamodel)
     api(libs.failsafe.core)
     api(project(":spi:common:policy-model"))