build(deps): Bump EDC to 0.7.0

eclipse-edc · Jun 7, 2024 · e1d236f · e1d236f
1 parent 5881d75
commit e1d236f
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 14 deletions.
diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml
@@ -36,7 +36,6 @@ services:
       EDC_API_AUTH_KEY: password
       EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
       EDC_KEYSTORE_PASSWORD: 123456
-      EDC_VAULT: /prerequisites/resources/configuration/provider-vault.properties
       EDC_FS_CONFIG: /prerequisites/resources/configuration/provider-configuration.properties
     entrypoint: java
       -javaagent:/app/opentelemetry-javaagent.jar
@@ -76,7 +75,6 @@ services:
       EDC_API_AUTH_KEY: password
       EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
       EDC_KEYSTORE_PASSWORD: 123456
-      EDC_VAULT: /prerequisites/resources/configuration/consumer-vault.properties
       EDC_FS_CONFIG: /prerequisites/resources/configuration/consumer-configuration.properties
       EDC_SAMPLES_TRANSFER_01_ASSET_PATH: /open-telemetry/README.md
     entrypoint: java

diff --git a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
 
     implementation(libs.edc.dsp)
     implementation(libs.edc.configuration.filesystem)
-    implementation(libs.edc.vault.filesystem)
 
     implementation(libs.edc.iam.mock)
     implementation(libs.edc.management.api)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ format.version = "1.1"
 [versions]
 assertj = "3.26.0"
 awaitility = "4.2.1"
-edc = "0.6.4"
+edc = "0.7.0"
 jakarta-json = "2.0.1"
 junit-pioneer = "2.2.0"
 jupiter = "5.10.2"

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java
@@ -35,7 +35,6 @@ public class PrerequisitesCommon {
     private static final String CONSUMER = "consumer";
     private static final String EDC_KEYSTORE = "edc.keystore";
     private static final String EDC_KEYSTORE_PASSWORD = "edc.keystore.password";
-    private static final String EDC_VAULT = "edc.vault";
     private static final String EDC_FS_CONFIG = "edc.fs.config";
 
     private static final String CERT_PFX_FILE_PATH = "transfer/transfer-00-prerequisites/resources/certs/cert.pfx";
@@ -79,7 +78,6 @@ private static EdcRuntimeExtension getConnector(
                 Map.of(
                         EDC_KEYSTORE, getFileFromRelativePath(CERT_PFX_FILE_PATH).getAbsolutePath(),
                         EDC_KEYSTORE_PASSWORD, KEYSTORE_PASSWORD,
-                        EDC_VAULT, getFileFromRelativePath(vaultPropertiesFilePath).getAbsolutePath(),
                         EDC_FS_CONFIG, getFileFromRelativePath(configPropertiesFilePath).getAbsolutePath()
                 )
         );

diff --git a/transfer/transfer-00-prerequisites/connector/build.gradle.kts b/transfer/transfer-00-prerequisites/connector/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.edc.control.plane.core)
     implementation(libs.edc.dsp)
     implementation(libs.edc.configuration.filesystem)
-    implementation(libs.edc.vault.filesystem)
     implementation(libs.edc.iam.mock)
     implementation(libs.edc.management.api)
     implementation(libs.edc.transfer.data.plane)

diff --git a/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties
@@ -7,7 +7,6 @@ web.http.management.path=/management
 web.http.protocol.port=29194
 web.http.protocol.path=/protocol
 edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
-edc.public.key.alias=public-key
 edc.transfer.dataplane.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.verifier.publickey.alias=public-key

diff --git a/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties
@@ -7,7 +7,6 @@ web.http.management.path=/management
 web.http.protocol.port=19194
 web.http.protocol.path=/protocol
 edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
-edc.public.key.alias=public-key
 edc.transfer.dataplane.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.verifier.publickey.alias=public-key

diff --git a/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts b/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     implementation(libs.edc.control.plane.core)
     implementation(libs.edc.dsp)
     implementation(libs.edc.configuration.filesystem)
-    implementation(libs.edc.vault.filesystem)
     implementation(libs.edc.iam.mock)
     implementation(libs.edc.management.api)
     implementation(libs.edc.transfer.data.plane)

diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties
@@ -14,12 +14,11 @@ edc.dsp.callback.address=http://localhost:9292/protocol
 #configuration from earlier examples
 edc.participant.id=consumer
 edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
-edc.public.key.alias=public-key
 edc.transfer.dataplane.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.verifier.publickey.alias=public-key
 web.http.public.port=29291
 web.http.public.path=/public
 web.http.control.port=29192
 web.http.control.path=/control
-edc.dataplane.token.validation.endpoint=http://localhost:29192/control/token
+edc.dataplane.token.validation.endpoint=http://localhost:29192/control/token
diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties
@@ -14,12 +14,11 @@ edc.dsp.callback.address=http://localhost:8282/protocol
 #configuration from earlier examples
 edc.participant.id=provider
 edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
-edc.public.key.alias=public-key
 edc.transfer.dataplane.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.signer.privatekey.alias=1
 edc.transfer.proxy.token.verifier.publickey.alias=public-key
 web.http.public.port=19291
 web.http.public.path=/public
 web.http.control.port=19192
 web.http.control.path=/control
-edc.dataplane.token.validation.endpoint=http://localhost:19192/control/token
+edc.dataplane.token.validation.endpoint=http://localhost:19192/control/token