fix(deps): add JSR310 dependency (#189)

* fix(deps): add JSR310 dependency * DEPENDENCIES * fix tests * fix tests
eclipse-edc · Apr 15, 2024 · 10ed2f5 · 10ed2f5
1 parent 0ad42ee
commit 10ed2f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -120,9 +120,9 @@ maven/mavencentral/org.apache.xbean/xbean-reflect/3.7, Apache-2.0, approved, cle
 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
 maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
-maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593
-maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595
-maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596
+maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14235
+maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78, MIT AND CC0-1.0, approved, #14237
+maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78, MIT, approved, #14238
 maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
 maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821
@@ -193,6 +193,7 @@ maven/mavencentral/org.eclipse.edc/jetty-core/0.6.1-SNAPSHOT, Apache-2.0, approv
 maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/json-ld/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/junit-base/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/junit/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc

diff --git a/...e/src/test/java/org/eclipse/edc/catalog/transform/JsonObjectToCatalogTransformerTest.java b/...e/src/test/java/org/eclipse/edc/catalog/transform/JsonObjectToCatalogTransformerTest.java
@@ -68,7 +68,7 @@ void transform_emptyCatalog_returnCatalog() {
 
         assertThat(result).isNotNull();
         assertThat(result.getId()).isEqualTo(CATALOG_ID);
-        assertThat(result.getDatasets()).isNull();
+        assertThat(result.getDatasets()).isNotNull();
         assertThat(result.getDataServices()).isNull();
 
         verifyNoInteractions(context);

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,6 +6,7 @@ awaitility = "4.2.0"
 edc = "0.6.1-SNAPSHOT"
 failsafe = "3.3.2"
 restAssured = "5.4.0"
+jackson = "2.17.0"
 
 [libraries]
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
@@ -54,6 +55,10 @@ edc-dsp-all = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
 edc-dsp-transform-catalog = { module = "org.eclipse.edc:dsp-catalog-transform", version.ref = "edc" }
 edc-controlplane-transform = { module = "org.eclipse.edc:control-plane-transform", version.ref = "edc" }
 
+# third-party desp
+jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
+
+
 [bundles]
 edc-connector = ["edc-boot", "edc-core-connector", "edc-core-jersey", "edc-api-observability"]
 edc-dpf = ["edc-dpf-selector-spi", "edc-dpf-selector-core"]

diff --git a/system-tests/end2end-test/e2e-junit-runner/build.gradle.kts b/system-tests/end2end-test/e2e-junit-runner/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
     testImplementation(libs.edc.dsp.transform.catalog)
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.json.ld.lib)
+    testImplementation(libs.jackson.jsr310)
 }
 
 edcBuild {