fix(dep): fix version catalogs and module dependencies (#155)

* fix(dep): fix version catalogs and module dependencies * DEPENDENCIES
eclipse-edc · Apr 5, 2024 · f5be160 · f5be160
1 parent 9727773
commit f5be160
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -238,7 +238,6 @@ maven/mavencentral/org.eclipse.edc/token-spi/0.6.1-SNAPSHOT, Apache-2.0, approve
 maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transform-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/util-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/util/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/validator-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" }