build: fix compilation

eclipse-edc · Feb 13, 2025 · 3a978de · 3a978de
1 parent e9f95b3
commit 3a978de
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,5 +20,5 @@ updates:
       - "dependencies"
       - "java"
     ignore:
-      - dependency-name: "org.eclipse.edc:edc-versions"
+      - dependency-name: "org.eclipse.edc:*"
 
diff --git a/core/federated-catalog-core/build.gradle.kts b/core/federated-catalog-core/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     implementation(libs.edc.lib.transform)
     implementation(libs.edc.dsp.api.configuration)
     implementation(libs.edc.spi.jsonld)
-    implementation(libs.edc.json.ld.lib)
+    implementation(libs.edc.lib.json.ld)
     implementation(libs.edc.lib.store)
 
     testImplementation(libs.edc.junit)
@@ -51,6 +51,6 @@ dependencies {
     testFixturesImplementation(libs.edc.core.connector)
     testFixturesImplementation(libs.edc.dsp.transform.catalog)
     testFixturesImplementation(libs.edc.dsp.transform.catalog.lib)
-    testFixturesImplementation(libs.edc.json.ld.lib)
+    testFixturesImplementation(libs.edc.lib.json.ld)
     testFixturesImplementation(libs.edc.controlplane.transform)
 }
diff --git a/dist/bom/federatedcatalog-base-bom/build.gradle.kts b/dist/bom/federatedcatalog-base-bom/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
     runtimeOnly(libs.edc.spi.jsonld)
 
     runtimeOnly(libs.bundles.edc.connector)
+    runtimeOnly(libs.edc.core.api)
     runtimeOnly(libs.edc.core.controlplane)
     runtimeOnly(libs.edc.core.jetty)
     runtimeOnly(libs.edc.core.token)
@@ -34,4 +35,4 @@ dependencies {
     runtimeOnly(libs.edc.dsp.all)
 
     //contains no IdentityService, this is added by catalog-dcp or catalog-mocked
-}
+}
diff --git a/extensions/api/federated-catalog-api/build.gradle.kts b/extensions/api/federated-catalog-api/build.gradle.kts
@@ -25,10 +25,10 @@ dependencies {
     implementation(libs.edc.spi.transform)
     implementation(libs.edc.spi.web)
     implementation(libs.edc.lib.jerseyproviders)
-    implementation(libs.edc.core.api) // for the ApiCoreSchema
+    implementation(libs.edc.lib.api)
 
     runtimeOnly(libs.edc.spi.jsonld)
-    runtimeOnly(libs.edc.json.ld.lib)
+    runtimeOnly(libs.edc.lib.json.ld)
 
     // required for integration test
     testImplementation(libs.edc.spi.dsp.http)
@@ -39,7 +39,7 @@ dependencies {
     testImplementation(libs.edc.ext.http)
     testImplementation(libs.restAssured)
     testImplementation(libs.edc.iam.mock)
-    testImplementation(libs.edc.json.ld.lib)
+    testImplementation(libs.edc.lib.json.ld)
     testImplementation(libs.edc.dsp.transform.catalog)
     testImplementation(libs.edc.dsp.transform.catalog.lib)
     testImplementation(testFixtures(libs.edc.core.jersey))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,7 +46,6 @@ edc-sql-pool = { module = "org.eclipse.edc:sql-pool-apache-commons", version.ref
 edc-sql-transactionlocal = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-sql-test-fixtures = { module = "org.eclipse.edc:sql-test-fixtures", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
-edc-json-ld-lib = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc" }
 edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }
 edc-spi-contract = { module = "org.eclipse.edc:contract-spi", version.ref = "edc" }
 edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
@@ -59,11 +58,12 @@ edc-spi-dataplane-selector = { module = "org.eclipse.edc:data-plane-selector-spi
 edc-spi-transaction-datasource = { module = "org.eclipse.edc:transaction-datasource-spi", version.ref = "edc" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
 
-
 # EDC libs
+edc-lib-api = { module = "org.eclipse.edc:api-lib", version.ref = "edc" }
 edc-lib-boot = { module = "org.eclipse.edc:boot-lib", version.ref = "edc" }
 edc-lib-jerseyproviders = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }
 edc-lib-json = { module = "org.eclipse.edc:json-lib", version.ref = "edc" }
+edc-lib-json-ld = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc" }
 edc-lib-providers-jersey = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }
 edc-lib-query = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-lib-sql = { module = "org.eclipse.edc:sql-lib", version.ref = "edc" }

diff --git a/system-tests/component-tests/build.gradle.kts b/system-tests/component-tests/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     testImplementation(libs.edc.spi.jsonld)
     testImplementation(libs.edc.spi.catalog)
     testImplementation(libs.edc.dsp.all)
-    testImplementation(libs.edc.json.ld.lib)
+    testImplementation(libs.edc.lib.json.ld)
     testImplementation(libs.edc.core.jetty)
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.spi.dataplane.selector)

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,7 +28,7 @@ dependencies {
     testImplementation(libs.edc.dsp.transform.catalog)
     testImplementation(libs.edc.dsp.transform.catalog.lib)
     testImplementation(libs.edc.junit)
-    testImplementation(libs.edc.json.ld.lib)
+    testImplementation(libs.edc.lib.json.ld)
     testImplementation(libs.jackson.jsr310)
 }