chore(build): updates to EDC 0.6.0 (#1168)

* chore(build): update to EDC 0.6.0 * DEPENDENCIES
eclipse-tractusx · Mar 28, 2024 · 5c0f418 · 5c0f418
1 parent cfa8917
commit 5c0f418
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 189 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/core/edr-core/build.gradle.kts b/core/edr-core/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.util)
     implementation(libs.edc.spi.contract)
     implementation(libs.edc.spi.controlplane)
-    implementation(libs.edc.statemachine)
+    implementation(libs.edc.lib.statemachine)
 
     implementation(project(":spi:edr-spi"))
     implementation(project(":spi:core-spi"))

diff --git a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/build.gradle.kts b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/build.gradle.kts
@@ -31,11 +31,11 @@ dependencies {
     implementation(libs.edc.spi.dataplane.dataplane)
     implementation(libs.edc.core.token)
     implementation(libs.edc.lib.query)
+    implementation(libs.edc.lib.cryptocommon)
 
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.dpf.core)
     testImplementation(libs.edc.core.connector)
-    testImplementation(libs.edc.common.crypto)
     testImplementation(libs.edc.lib.boot)
 }
 
diff --git a/edc-extensions/edr/edr-api-v2/build.gradle.kts b/edc-extensions/edr/edr-api-v2/build.gradle.kts
@@ -37,6 +37,6 @@ dependencies {
     testImplementation(testFixtures(libs.edc.core.jersey))
     testImplementation(libs.restAssured)
     testImplementation(libs.edc.junit)
-    testImplementation(libs.edc.ext.jersey.providers)
+    testImplementation(libs.edc.lib.jersey.providers)
     testImplementation(libs.edc.core.transform)
 }
diff --git a/edc-extensions/edr/edr-api/build.gradle.kts b/edc-extensions/edr/edr-api/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
     testImplementation(testFixtures(libs.edc.core.jersey))
     testImplementation(libs.restAssured)
     testImplementation(libs.edc.junit)
-    testImplementation(libs.edc.ext.jersey.providers)
+    testImplementation(libs.edc.lib.jersey.providers)
     testImplementation(libs.edc.core.transform)
 }
diff --git a/edc-extensions/transferprocess-sftp-client/build.gradle.kts b/edc-extensions/transferprocess-sftp-client/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
     implementation(libs.edc.spi.dataplane.dataplane)
     implementation(libs.edc.dpf.util)
     implementation(libs.edc.dpf.core)
-    implementation(libs.edc.policy.engine)
+    implementation(libs.edc.lib.policyengine)
     implementation(libs.bouncyCastle.bcpkixJdk18on)
 
     implementation(libs.apache.sshd.core)

diff --git a/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts b/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation(project(":edc-extensions:transferprocess-sftp-common"))
 
     implementation(libs.edc.spi.core)
-    implementation(libs.edc.policy.engine)
+    implementation(libs.edc.lib.policyengine)
     implementation(libs.edc.spi.transfer)
 
     testImplementation(libs.edc.junit)

diff --git a/edc-tests/edc-controlplane/fixtures/build.gradle.kts b/edc-tests/edc-controlplane/fixtures/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     testFixturesApi(libs.edc.spi.contract)
     testFixturesApi(testFixtures(libs.edc.api.management.test.fixtures))
     testFixturesApi(libs.edc.spi.edrstore)
-    testFixturesApi(libs.edc.common.crypto)
+    testFixturesApi(libs.edc.lib.cryptocommon)
     testFixturesApi(libs.edc.lib.boot)
 
     // api modules for some test utils

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.5.2-SNAPSHOT"
+edc = "0.6.0"
 apache-sshd = "2.12.1"
 assertj = "3.25.3"
 awaitility = "4.2.0"
@@ -57,7 +57,6 @@ edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", v
 edc-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
 edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
 edc-vault-hashicorp = { module = "org.eclipse.edc:vault-hashicorp", version.ref = "edc" }
-edc-common-crypto = { module = "org.eclipse.edc:crypto-common", version.ref = "edc" }
 edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
 edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-core-jetty = { module = "org.eclipse.edc:jetty-core", version.ref = "edc" }
@@ -69,7 +68,6 @@ edc-core-validator = { module = "org.eclipse.edc:validator-core", version.ref =
 edc-core-transform = { module = "org.eclipse.edc:transform-core", version.ref = "edc" }
 edc-core-token = { module = "org.eclipse.edc:token-core", version.ref = "edc" }
 edc-core-edrstore = { module = "org.eclipse.edc:edr-store-core", version.ref = "edc" }
-edc-statemachine = { module = "org.eclipse.edc:state-machine", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
 edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
@@ -82,21 +80,23 @@ edc-api-transferprocess = { module = "org.eclipse.edc:transfer-process-api", ver
 edc-api-controlplane = { module = "org.eclipse.edc:control-plane-api", version.ref = "edc" }
 edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
-edc-policy-engine = { module = "org.eclipse.edc:policy-engine", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-auth-oauth2-client = { module = "org.eclipse.edc:oauth2-client", version.ref = "edc" }
 edc-transaction-local = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-ext-azure-cosmos-core = { module = "org.eclipse.edc:azure-cosmos-core", version.ref = "edc" }
 edc-ext-azure-test = { module = "org.eclipse.edc:azure-test", version.ref = "edc" }
 edc-ext-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
-edc-ext-jersey-providers = { module = "org.eclipse.edc:jersey-providers", version.ref = "edc" }
 edc-validator-data-address-http-data = { module = "org.eclipse.edc:validator-data-address-http-data", version.ref = "edc" }
 edc-lib-boot = { module = "org.eclipse.edc:boot-lib", version.ref = "edc" }
+edc-lib-cryptocommon = { module = "org.eclipse.edc:crypto-common-lib", version.ref = "edc" }
 edc-lib-http = { module = "org.eclipse.edc:http-lib", version.ref = "edc" }
-edc-lib-query = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
+edc-lib-jersey-providers = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }
 edc-lib-jsonld = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc" }
+edc-lib-policyengine = { module = "org.eclipse.edc:policy-engine-lib", version.ref = "edc" }
+edc-lib-query = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-lib-store = { module = "org.eclipse.edc:store-lib", version.ref = "edc" }
+edc-lib-statemachine = { module = "org.eclipse.edc:state-machine-lib", version.ref = "edc" }
 
 
 # implementations