From a94c65ece0eb8833cd346437e5b9492e7ca1ea79 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 5 Apr 2024 12:19:07 +0200 Subject: [PATCH] fix(dep): fix version catalogs and module dependencies --- extensions/common/gcp/gcp-core/build.gradle.kts | 2 +- extensions/common/vault/vault-gcp/build.gradle.kts | 2 +- .../control-plane/provision/provision-bigquery/build.gradle.kts | 2 +- .../control-plane/provision/provision-gcs/build.gradle.kts | 2 +- .../data-plane/data-plane-google-storage/build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/common/gcp/gcp-core/build.gradle.kts b/extensions/common/gcp/gcp-core/build.gradle.kts index 6fc63996..d1899faf 100644 --- a/extensions/common/gcp/gcp-core/build.gradle.kts +++ b/extensions/common/gcp/gcp-core/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { api(libs.edc.spi.core) api(libs.edc.spi.dataplane) api(libs.edc.spi.transfer) - api(libs.edc.util) + api(libs.edc.lib.util) implementation(libs.edc.spi.validator) diff --git a/extensions/common/vault/vault-gcp/build.gradle.kts b/extensions/common/vault/vault-gcp/build.gradle.kts index b7cc79bd..7f33bc24 100644 --- a/extensions/common/vault/vault-gcp/build.gradle.kts +++ b/extensions/common/vault/vault-gcp/build.gradle.kts @@ -18,7 +18,7 @@ plugins { dependencies { api(libs.edc.spi.core) - implementation(libs.edc.util) + implementation(libs.edc.lib.util) implementation(project(":extensions:common:gcp:gcp-core")) diff --git a/extensions/control-plane/provision/provision-bigquery/build.gradle.kts b/extensions/control-plane/provision/provision-bigquery/build.gradle.kts index 6ae26cc1..daa44d09 100644 --- a/extensions/control-plane/provision/provision-bigquery/build.gradle.kts +++ b/extensions/control-plane/provision/provision-bigquery/build.gradle.kts @@ -18,7 +18,7 @@ plugins { dependencies { api(libs.edc.spi.core) - implementation(libs.edc.util) + implementation(libs.edc.lib.util) implementation(libs.failsafe.core) implementation(project(":extensions:common:gcp:gcp-core")) diff --git a/extensions/control-plane/provision/provision-gcs/build.gradle.kts b/extensions/control-plane/provision/provision-gcs/build.gradle.kts index dab54e9d..081d38fa 100644 --- a/extensions/control-plane/provision/provision-gcs/build.gradle.kts +++ b/extensions/control-plane/provision/provision-gcs/build.gradle.kts @@ -18,7 +18,7 @@ plugins { dependencies { api(libs.edc.spi.core) - implementation(libs.edc.util) + implementation(libs.edc.lib.util) implementation(libs.failsafe.core) implementation(project(":extensions:common:gcp:gcp-core")) diff --git a/extensions/data-plane/data-plane-google-storage/build.gradle.kts b/extensions/data-plane/data-plane-google-storage/build.gradle.kts index 530f40b2..325b9e04 100644 --- a/extensions/data-plane/data-plane-google-storage/build.gradle.kts +++ b/extensions/data-plane/data-plane-google-storage/build.gradle.kts @@ -19,7 +19,7 @@ plugins { dependencies { api(libs.edc.spi.dataplane) api(libs.edc.core.dataplane.util) - implementation(libs.edc.util) + implementation(libs.edc.lib.util) implementation(libs.edc.spi.validator) implementation(project(":extensions:common:gcp:gcp-core")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52c9f3b3..19e6ae87 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ edc-spi-transfer = { module = "org.eclipse.edc:transfer-spi", version.ref = "edc edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" } edc-spi-validator = { module = "org.eclipse.edc:validator-spi", version.ref = "edc" } edc-transfer-httppull-receiver-dynamic = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" } -edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" } +edc-lib-util = { module = "org.eclipse.edc:util-lib", version.ref = "edc" } # third-party dependencies failsafe-core = { module = "dev.failsafe:failsafe", version.ref = "failsafe" }