From e1d236f32bd7eb943723102653a0605a6087d871 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Fri, 7 Jun 2024 08:54:25 +0200 Subject: [PATCH] build(deps): Bump EDC to 0.7.0 --- advanced/advanced-01-open-telemetry/docker-compose.yaml | 2 -- .../open-telemetry-runtime/build.gradle.kts | 1 - gradle/libs.versions.toml | 2 +- .../org/eclipse/edc/samples/common/PrerequisitesCommon.java | 2 -- transfer/transfer-00-prerequisites/connector/build.gradle.kts | 1 - .../resources/configuration/consumer-configuration.properties | 1 - .../resources/configuration/provider-configuration.properties | 1 - .../consumer-with-listener/build.gradle.kts | 1 - .../cloud-transfer-consumer/config.properties | 3 +-- .../cloud-transfer-provider/config.properties | 3 +-- 10 files changed, 3 insertions(+), 14 deletions(-) diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml index ef1d1aed..d7708e2c 100644 --- 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 index 49089b04..68ade7b3 100644 --- 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 index dbf89dc1..239eba77 100644 --- 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 index e365b91f..0d9d709a 100644 --- 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 index 3ce117a2..c7584fa6 100644 --- 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 index bb7df005..5aaea4db 100644 --- 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 index 4679ff53..01036f4f 100644 --- 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 index 719b6384..7b70eb50 100644 --- 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 index ba908c73..ae19e14c 100644 --- 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,7 +14,6 @@ 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 @@ -22,4 +21,4 @@ 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 \ No newline at end of file +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 index a285778d..a9f7dd05 100644 --- 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,7 +14,6 @@ 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 @@ -22,4 +21,4 @@ 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 \ No newline at end of file +edc.dataplane.token.validation.endpoint=http://localhost:19192/control/token