fix(dependency): update more dependencies (#320)

* fix(dependency): update more dependencies * DEPENDENCIES
eclipse-edc · Apr 5, 2024 · 1b70f00 · 1b70f00
1 parent 32d5d6d
commit 1b70f00
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -264,7 +264,7 @@ maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.1-SNAPSHOT, Apache-2.0, appro
 maven/mavencentral/org.eclipse.edc/json-ld/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/jws2020/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jws2020-lib/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
 maven/mavencentral/org.eclipse.edc/jwt-verifiable-credentials/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/keys-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -289,7 +289,6 @@ maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.1-SNAPSHOT, Apache-2.0, appr
 maven/mavencentral/org.eclipse.edc/transform-lib/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-lib/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

diff --git a/core/identity-hub-credentials/build.gradle.kts b/core/identity-hub-credentials/build.gradle.kts
@@ -11,9 +11,9 @@ dependencies {
     implementation(libs.edc.core.connector) // for the CriterionToPredicateConverterImpl
     implementation(libs.edc.common.crypto) // for the crypto converter
     implementation(libs.edc.ext.jsonld) // for the JSON-LD mapper
-    implementation(libs.edc.jws2020)
+    implementation(libs.edc.lib.jws2020)
     implementation(libs.edc.vc.ldp)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.edc.lib.store)
     implementation(libs.nimbus.jwt)
     implementation(libs.edc.lib.jsonld)

diff --git a/extensions/api/identityhub-management-api-validators/build.gradle.kts b/extensions/api/identityhub-management-api-validators/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(libs.edc.spi.core)
     api(project(":spi:identity-hub-spi"))
     api(project(":spi:identity-hub-did-spi"))
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     testImplementation(libs.edc.junit)
 }
diff --git a/extensions/api/keypair-mgmt-api/build.gradle.kts b/extensions/api/keypair-mgmt-api/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":extensions:api:identityhub-management-api-configuration"))
     implementation(project(":extensions:api:identityhub-management-api-validators"))
     implementation(libs.edc.spi.web)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.jakarta.rsApi)
     implementation(libs.jakarta.annotation)
 

diff --git a/extensions/api/participant-context-mgmt-api/build.gradle.kts b/extensions/api/participant-context-mgmt-api/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation(project(":extensions:api:identityhub-management-api-validators"))
     implementation(libs.edc.spi.validator)
     implementation(libs.edc.spi.web)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.edc.core.jerseyproviders)
     implementation(libs.jakarta.rsApi)
     implementation(libs.jakarta.annotation)

diff --git a/extensions/api/verifiable-credential-mgmt-api/build.gradle.kts b/extensions/api/verifiable-credential-mgmt-api/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(project(":spi:identity-hub-store-spi"))
     implementation(project(":extensions:api:identityhub-management-api-configuration"))
     implementation(libs.edc.spi.web)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     implementation(libs.jakarta.rsApi)
     implementation(libs.jakarta.annotation)
 

diff --git a/extensions/common/security/build.gradle.kts b/extensions/common/security/build.gradle.kts
@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
     implementation(libs.edc.spi.core)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
     testImplementation(libs.edc.junit)
 }
diff --git a/extensions/store/sql/identity-hub-credentials-store-sql/build.gradle.kts b/extensions/store/sql/identity-hub-credentials-store-sql/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     api(project(":spi:identity-hub-store-spi"))
     implementation(libs.edc.core.sql) // for the SqlStatements
     implementation(libs.edc.spi.transaction.datasource)
-    implementation(libs.edc.util)
+    implementation(libs.edc.lib.util)
 
     testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
     testImplementation(testFixtures(libs.edc.core.sql))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,9 +20,8 @@ testcontainers = "1.19.3"
 tink = "1.12.0"
 
 [libraries]
-edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
+
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
-edc-jws2020 = { module = "org.eclipse.edc:jws2020", version.ref = "edc" }
 edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
 edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
 edc-spi-jwt = { module = "org.eclipse.edc:jwt-spi", version.ref = "edc" }
@@ -59,8 +58,10 @@ edc-testfixtures-managementapi = { module = "org.eclipse.edc:management-api-test
 edc-lib-keys = { "module" = "org.eclipse.edc:keys-lib", version.ref = "edc" }
 edc-lib-query = { "module" = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-lib-jsonld = { "module" = "org.eclipse.edc:json-ld-lib", version.ref = "edc" }
+edc-lib-jws2020 = { module = "org.eclipse.edc:jws2020-lib", version.ref = "edc" }
 edc-lib-store = { "module" = "org.eclipse.edc:store-lib", version.ref = "edc" }
 edc-lib-transform = { module = "org.eclipse.edc:transform-lib", version.ref = "edc" }
+edc-lib-util = { module = "org.eclipse.edc:util-lib", version.ref = "edc" }
 edc-common-crypto = { module = "org.eclipse.edc:crypto-common-lib", version.ref = "edc" }
 edc-core-jerseyproviders = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }