diff --git a/deployment/assets/postgres/edc_schema.sql b/deployment/assets/postgres/edc_schema.sql index 15a829d5..502aa05b 100644 --- a/deployment/assets/postgres/edc_schema.sql +++ b/deployment/assets/postgres/edc_schema.sql @@ -242,3 +242,10 @@ CREATE TABLE IF NOT EXISTS edc_edr_entry contract_negotiation_id VARCHAR, created_at BIGINT NOT NULL ); + +CREATE TABLE IF NOT EXISTS edc_federated_catalog +( + id VARCHAR PRIMARY KEY NOT NULL, + catalog JSON, + marked BOOLEAN DEFAULT FALSE +); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52834e52..37e990d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ format.version = "1.1" [versions] assertj = "3.24.2" awaitility = "4.2.0" -edc = "0.8.0" +edc = "0.8.1-SNAPSHOT" failsafe = "3.3.2" jackson = "2.14.2" jupiter = "5.10.1" @@ -129,6 +129,7 @@ edc-oauth2-client = { module = "org.eclipse.edc:oauth2-client", version.ref = "e edc-fc-spi-crawler = { module = "org.eclipse.edc:crawler-spi", version.ref = "edc" } edc-fc-core = { module = "org.eclipse.edc:federated-catalog-core", version.ref = "edc" } edc-fc-api = { module = "org.eclipse.edc:federated-catalog-api", version.ref = "edc" } +edc-fc-cache-sql = { module = "org.eclipse.edc:federated-catalog-cache-sql", version.ref = "edc" } # specific dependencies needed by the catalog server edc-controlplane-catalog = { module = "org.eclipse.edc:control-plane-catalog", version.ref = "edc" } @@ -162,5 +163,7 @@ sql-edc = ["edc-sql-assetindex", "edc-sql-contractdef", "edc-sql-contractneg", " sql-ih = ["edc-sql-ih-credstore-sql", "edc-sql-ih-didstore-sql", "edc-sql-ih-keypairstore-sql", "edc-sql-ih-pcstore-sql", "edc-sql-core", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"] +sql-fc = ["edc-fc-cache-sql"] + [plugins] shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } diff --git a/launchers/controlplane/build.gradle.kts b/launchers/controlplane/build.gradle.kts index d8fce1f3..bebcc0c2 100644 --- a/launchers/controlplane/build.gradle.kts +++ b/launchers/controlplane/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { if (project.properties.getOrDefault("persistence", "false") == "true") { runtimeOnly(libs.edc.vault.hashicorp) runtimeOnly(libs.bundles.sql.edc) + runtimeOnly(libs.bundles.sql.fc) println("This runtime compiles with Hashicorp Vault and PostgreSQL. You will need properly configured Postgres and HCV instances.") } runtimeOnly(libs.bundles.dpf)