From 4f001863ecea8469da10c7089ce82d60544d1e82 Mon Sep 17 00:00:00 2001 From: mokhairymahmoud Date: Sun, 22 Mar 2026 21:51:17 +0200 Subject: [PATCH] refactor: migrate to DSP 2025-1 --- advanced/advanced-01-open-telemetry/README.md | 12 ++++++------ .../advanced-01-open-telemetry/docker-compose.yaml | 4 ++-- .../resources/get-dataset.json | 6 +++--- .../resources/negotiate-contract.json | 4 ++-- .../resources/start-transfer.json | 4 ++-- federated-catalog/fc-01-embedded/README.md | 2 +- .../fc-01-embedded/fc-connector/config.properties | 2 +- federated-catalog/fc-02-standalone/README.md | 2 +- .../fc-03-static-node-directory/README.md | 4 ++-- policy/policy-01-policy-enforcement/README.md | 4 ++-- .../policy-enforcement-consumer/config.properties | 2 +- .../policy-enforcement-provider/config.properties | 2 +- .../resources/catalog-request.json | 4 ++-- .../resources/contract-request.json | 4 ++-- .../transfer/Transfer05fileTransferCloudTest.java | 2 +- .../samples/transfer/Transfer06KafkaBrokerTest.java | 4 ++-- .../src/test/resources/policy/config-eu.properties | 2 +- .../src/test/resources/policy/config-us.properties | 2 +- .../configuration/consumer-configuration.properties | 2 +- .../configuration/provider-configuration.properties | 2 +- transfer/transfer-01-negotiation/README.md | 10 +++++----- .../resources/fetch-catalog.json | 4 ++-- .../resources/get-dataset.json | 4 ++-- .../resources/negotiate-contract.json | 4 ++-- .../resources/start-transfer.json | 4 ++-- .../resources/configuration/provider.properties | 2 +- .../resources/start-transfer.json | 4 ++-- .../cloud-transfer-consumer/config.properties | 2 +- .../cloud-transfer-provider/config.properties | 2 +- .../resources/fetch-catalog.json | 4 ++-- .../resources/get-dataset.json | 4 ++-- .../resources/negotiate-contract.json | 4 ++-- .../resources/start-transfer.json | 4 ++-- transfer/transfer-06-kafka-broker/4-get-dataset.json | 4 ++-- .../5-negotiate-contract.json | 4 ++-- transfer/transfer-06-kafka-broker/6-transfer.json | 4 ++-- transfer/transfer-06-kafka-broker/README.md | 2 +- .../kafka-runtime/consumer.properties | 2 +- .../kafka-runtime/provider.properties | 2 +- 39 files changed, 70 insertions(+), 70 deletions(-) diff --git a/advanced/advanced-01-open-telemetry/README.md b/advanced/advanced-01-open-telemetry/README.md index bdd374c4..d2368b8d 100644 --- a/advanced/advanced-01-open-telemetry/README.md +++ b/advanced/advanced-01-open-telemetry/README.md @@ -99,9 +99,9 @@ The output will be something like: "@id": "cb701b36-48ee-4132-8436-dba7b83c606c", "@type": "dcat:DataService", "dcat:endpointDescription": "dspace:connector", - "dcat:endpointUrl": "http://provider:19194/protocol", + "dcat:endpointUrl": "http://provider:19194/protocol/2025-1", "dct:terms": "dspace:connector", - "dct:endpointUrl": "http://provider:19194/protocol" + "dct:endpointUrl": "http://provider:19194/protocol/2025-1" } }, { @@ -113,9 +113,9 @@ The output will be something like: "@id": "cb701b36-48ee-4132-8436-dba7b83c606c", "@type": "dcat:DataService", "dcat:endpointDescription": "dspace:connector", - "dcat:endpointUrl": "http://provider:19194/protocol", + "dcat:endpointUrl": "http://provider:19194/protocol/2025-1", "dct:terms": "dspace:connector", - "dct:endpointUrl": "http://provider:19194/protocol" + "dct:endpointUrl": "http://provider:19194/protocol/2025-1" } } ], @@ -128,7 +128,7 @@ The output will be something like: "dcat": "http://www.w3.org/ns/dcat#", "dct": "http://purl.org/dc/terms/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } @@ -217,7 +217,7 @@ which has to be stored in the root folder of this sample as well. The only addit WEB_HTTP_MANAGEMENT_AUTH_KEY: password WEB_HTTP_PROTOCOL_PORT: 9292 WEB_HTTP_PROTOCOL_PATH: /protocol - EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol + EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol/2025-1 EDC_PARTICIPANT_ID: consumer entrypoint: java -javaagent:/resources/opentelemetry-javaagent.jar diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml index a2f1e11b..71b4b01a 100644 --- a/advanced/advanced-01-open-telemetry/docker-compose.yaml +++ b/advanced/advanced-01-open-telemetry/docker-compose.yaml @@ -32,7 +32,7 @@ services: WEB_HTTP_VERSION_PORT: 29195 WEB_HTTP_VERSION_PATH: /version EDC_CONTROL_ENDPOINT: http://consumer:29192/control - EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol + EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol/2025-1 EDC_PARTICIPANT_ID: consumer EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx EDC_KEYSTORE_PASSWORD: 123456 @@ -72,7 +72,7 @@ services: WEB_HTTP_VERSION_PORT: 19195 WEB_HTTP_VERSION_PATH: /version EDC_CONTROL_ENDPOINT: http://provider:19192/control - EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol + EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol/2025-1 EDC_PARTICIPANT_ID: provider EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx EDC_KEYSTORE_PASSWORD: 123456 diff --git a/advanced/advanced-01-open-telemetry/resources/get-dataset.json b/advanced/advanced-01-open-telemetry/resources/get-dataset.json index 217aa29a..881bba6d 100644 --- a/advanced/advanced-01-open-telemetry/resources/get-dataset.json +++ b/advanced/advanced-01-open-telemetry/resources/get-dataset.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "assetId", - "counterPartyAddress": "http://provider:19194/protocol", - "protocol": "dataspace-protocol-http" -} \ No newline at end of file + "counterPartyAddress": "http://provider:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" +} diff --git a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json index 44b73204..c240d25e 100644 --- a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json +++ b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json @@ -3,8 +3,8 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://provider:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyAddress": "http://provider:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", diff --git a/advanced/advanced-01-open-telemetry/resources/start-transfer.json b/advanced/advanced-01-open-telemetry/resources/start-transfer.json index 354566ce..017852e7 100644 --- a/advanced/advanced-01-open-telemetry/resources/start-transfer.json +++ b/advanced/advanced-01-open-telemetry/resources/start-transfer.json @@ -4,8 +4,8 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://provider:19194/protocol", + "counterPartyAddress": "http://provider:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PULL" } diff --git a/federated-catalog/fc-01-embedded/README.md b/federated-catalog/fc-01-embedded/README.md index 7e6d3e1e..2e4a0c85 100644 --- a/federated-catalog/fc-01-embedded/README.md +++ b/federated-catalog/fc-01-embedded/README.md @@ -115,7 +115,7 @@ Sample output: }, "dspace:participantId": "provider", - "originator": "http://localhost:19194/protocol", + "originator": "http://localhost:19194/protocol/2025-1", "@context": { } } diff --git a/federated-catalog/fc-01-embedded/fc-connector/config.properties b/federated-catalog/fc-01-embedded/fc-connector/config.properties index 0f3ea1dd..8c7f6247 100644 --- a/federated-catalog/fc-01-embedded/fc-connector/config.properties +++ b/federated-catalog/fc-01-embedded/fc-connector/config.properties @@ -1,5 +1,5 @@ edc.participant.id=fc-connector -edc.dsp.callback.address=http://localhost:19194/protocol +edc.dsp.callback.address=http://localhost:19194/protocol/2025-1 web.http.port=29191 web.http.path=/api web.http.management.port=29193 diff --git a/federated-catalog/fc-02-standalone/README.md b/federated-catalog/fc-02-standalone/README.md index 0e141bfc..813fa217 100644 --- a/federated-catalog/fc-02-standalone/README.md +++ b/federated-catalog/fc-02-standalone/README.md @@ -98,7 +98,7 @@ Sample output: }, "dspace:participantId": "provider", - "originator": "http://localhost:19194/protocol", + "originator": "http://localhost:19194/protocol/2025-1", "@context": { } diff --git a/federated-catalog/fc-03-static-node-directory/README.md b/federated-catalog/fc-03-static-node-directory/README.md index ad02ad19..c5608027 100644 --- a/federated-catalog/fc-03-static-node-directory/README.md +++ b/federated-catalog/fc-03-static-node-directory/README.md @@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr { "name": "https://w3id.org/edc/v0.0.1/ns/", "id": "provider", - "url": "http://localhost:19194/protocol", - "supportedProtocols": ["dataspace-protocol-http"] + "url": "http://localhost:19194/protocol/2025-1", + "supportedProtocols": ["dataspace-protocol-http:2025-1"] } ``` However, this solution is intended for use only within the sample scope; in production, it must be managed in different way. diff --git a/policy/policy-01-policy-enforcement/README.md b/policy/policy-01-policy-enforcement/README.md index 598db16e..1d0abcf2 100644 --- a/policy/policy-01-policy-enforcement/README.md +++ b/policy/policy-01-policy-enforcement/README.md @@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer "@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87", "@type": "dcat:DataService", "dct:terms": "connector", - "dct:endpointUrl": "http://localhost:8282/protocol" + "dct:endpointUrl": "http://localhost:8282/protocol/2025-1" }, "participantId": "provider", "@context": { @@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer "dcat": "https://www.w3.org/ns/dcat/", "dct": "https://purl.org/dc/terms/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } diff --git a/policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties b/policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties index 4e771a6c..ab17f518 100644 --- a/policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties +++ b/policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties @@ -8,7 +8,7 @@ web.http.version.port=29195 web.http.version.path=/version web.http.management.auth.key=password -edc.dsp.callback.address=http://localhost:29194/protocol +edc.dsp.callback.address=http://localhost:29194/protocol/2025-1 edc.participant.id=consumer edc.ids.id=urn:connector:consumer edc.mock.region=us diff --git a/policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties b/policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties index ba70fc6d..13c5e4de 100644 --- a/policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties +++ b/policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties @@ -8,6 +8,6 @@ web.http.version.port=19195 web.http.version.path=/version web.http.management.auth.key=password -edc.dsp.callback.address=http://localhost:19194/protocol +edc.dsp.callback.address=http://localhost:19194/protocol/2025-1 edc.participant.id=provider edc.ids.id=urn:connector:provider diff --git a/policy/policy-01-policy-enforcement/resources/catalog-request.json b/policy/policy-01-policy-enforcement/resources/catalog-request.json index 370b4f2f..912f69ca 100644 --- a/policy/policy-01-policy-enforcement/resources/catalog-request.json +++ b/policy/policy-01-policy-enforcement/resources/catalog-request.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/policy/policy-01-policy-enforcement/resources/contract-request.json b/policy/policy-01-policy-enforcement/resources/contract-request.json index e254def0..3cf672dc 100644 --- a/policy/policy-01-policy-enforcement/resources/contract-request.json +++ b/policy/policy-01-policy-enforcement/resources/contract-request.json @@ -3,8 +3,8 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5", diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java index 289b1f4f..e94177a0 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java @@ -116,7 +116,7 @@ public class Transfer05fileTransferCloudTest { new EmbeddedRuntime(PROVIDER, PROVIDER_MODULE_PATH) .configurationProvider(() -> ConfigFactory.fromMap(Map.ofEntries( entry("edc.participant.id", "provider"), - entry("edc.dsp.callback.address", "http://localhost:19194/protocol"), + entry("edc.dsp.callback.address", "http://localhost:19194/protocol/2025-1"), entry("web.http.port", "19191"), entry("web.http.path", "/api"), entry("web.http.management.port", "19193"), diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java index 5521cb35..4b37dcf4 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java @@ -90,13 +90,13 @@ public class Transfer06KafkaBrokerTest { .name("provider") .id("provider") .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:18181/management"))) - .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol"))) + .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol/2025-1"))) .build(); private static final StreamingParticipant CONSUMER = StreamingParticipant.Builder.newStreamingInstance() .name("consumer") .id("consumer") .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:28181/management"))) - .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol"))) + .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol/2025-1"))) .build(); private static final String GROUP_ID = "group_id"; diff --git a/system-tests/src/test/resources/policy/config-eu.properties b/system-tests/src/test/resources/policy/config-eu.properties index ab317045..2e470413 100644 --- a/system-tests/src/test/resources/policy/config-eu.properties +++ b/system-tests/src/test/resources/policy/config-eu.properties @@ -6,7 +6,7 @@ web.http.protocol.port=29194 web.http.protocol.path=/protocol web.http.management.auth.key=password -edc.dsp.callback.address=http://localhost:29194/protocol +edc.dsp.callback.address=http://localhost:29194/protocol/2025-1 edc.participant.id=consumer edc.ids.id=urn:connector:consumer edc.mock.region=eu diff --git a/system-tests/src/test/resources/policy/config-us.properties b/system-tests/src/test/resources/policy/config-us.properties index 4af9885b..0ff8f0d7 100644 --- a/system-tests/src/test/resources/policy/config-us.properties +++ b/system-tests/src/test/resources/policy/config-us.properties @@ -6,7 +6,7 @@ web.http.protocol.port=29194 web.http.protocol.path=/protocol web.http.management.auth.key=password -edc.dsp.callback.address=http://localhost:29194/protocol +edc.dsp.callback.address=http://localhost:29194/protocol/2025-1 edc.participant.id=consumer edc.ids.id=urn:connector:consumer edc.mock.region=us diff --git a/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties index 37e27eed..9965804a 100644 --- a/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties +++ b/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties @@ -1,5 +1,5 @@ edc.participant.id=consumer -edc.dsp.callback.address=http://localhost:29194/protocol +edc.dsp.callback.address=http://localhost:29194/protocol/2025-1 web.http.port=29191 web.http.path=/api web.http.management.port=29193 diff --git a/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties index 7f0dffd5..9284fc8b 100644 --- a/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties +++ b/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties @@ -1,5 +1,5 @@ edc.participant.id=provider -edc.dsp.callback.address=http://localhost:19194/protocol +edc.dsp.callback.address=http://localhost:19194/protocol/2025-1 web.http.port=19191 web.http.path=/api web.http.management.port=19193 diff --git a/transfer/transfer-01-negotiation/README.md b/transfer/transfer-01-negotiation/README.md index ac079505..72181e71 100644 --- a/transfer/transfer-01-negotiation/README.md +++ b/transfer/transfer-01-negotiation/README.md @@ -143,7 +143,7 @@ Sample output: "@id": "2a5178c3-c937-4ac2-85be-c46dbc6c5642", "@type": "dcat:DataService", "dct:terms": "connector", - "dct:endpointUrl": "http://localhost:19194/protocol" + "dct:endpointUrl": "http://localhost:19194/protocol/2025-1" }, "participantId": "anonymous", "@context": { @@ -151,7 +151,7 @@ Sample output: "dct": "https://purl.org/dc/terms/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ``` @@ -216,9 +216,9 @@ Sample output: "@type": "ContractNegotiation", "@id": "5ca21b82-075b-4682-add8-c26c9a2ced67", "type": "CONSUMER", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "state": "FINALIZED", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "callbackAddresses": [], "contractAgreementId": "0b3150be-feaf-43bc-91e1-90f050de28bd", <--------- "@context": { @@ -226,7 +226,7 @@ Sample output: "dct": "https://purl.org/dc/terms/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ``` diff --git a/transfer/transfer-01-negotiation/resources/fetch-catalog.json b/transfer/transfer-01-negotiation/resources/fetch-catalog.json index 370b4f2f..912f69ca 100644 --- a/transfer/transfer-01-negotiation/resources/fetch-catalog.json +++ b/transfer/transfer-01-negotiation/resources/fetch-catalog.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/transfer/transfer-01-negotiation/resources/get-dataset.json b/transfer/transfer-01-negotiation/resources/get-dataset.json index 5286af00..856ffaa9 100644 --- a/transfer/transfer-01-negotiation/resources/get-dataset.json +++ b/transfer/transfer-01-negotiation/resources/get-dataset.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "assetId", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } \ No newline at end of file diff --git a/transfer/transfer-01-negotiation/resources/negotiate-contract.json b/transfer/transfer-01-negotiation/resources/negotiate-contract.json index 82fe8036..413c08ab 100644 --- a/transfer/transfer-01-negotiation/resources/negotiate-contract.json +++ b/transfer/transfer-01-negotiation/resources/negotiate-contract.json @@ -3,8 +3,8 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", diff --git a/transfer/transfer-02-provider-push/resources/start-transfer.json b/transfer/transfer-02-provider-push/resources/start-transfer.json index f0a02b4a..29e424e7 100644 --- a/transfer/transfer-02-provider-push/resources/start-transfer.json +++ b/transfer/transfer-02-provider-push/resources/start-transfer.json @@ -4,9 +4,9 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PUSH", "dataDestination": { "type": "HttpData", diff --git a/transfer/transfer-03-consumer-pull/resources/configuration/provider.properties b/transfer/transfer-03-consumer-pull/resources/configuration/provider.properties index b74ec8e0..f2f38a99 100644 --- a/transfer/transfer-03-consumer-pull/resources/configuration/provider.properties +++ b/transfer/transfer-03-consumer-pull/resources/configuration/provider.properties @@ -1,5 +1,5 @@ edc.participant.id=provider -edc.dsp.callback.address=http://localhost:19194/protocol +edc.dsp.callback.address=http://localhost:19194/protocol/2025-1 web.http.port=19191 web.http.path=/api web.http.management.port=19193 diff --git a/transfer/transfer-03-consumer-pull/resources/start-transfer.json b/transfer/transfer-03-consumer-pull/resources/start-transfer.json index ff44b695..f59ec024 100644 --- a/transfer/transfer-03-consumer-pull/resources/start-transfer.json +++ b/transfer/transfer-03-consumer-pull/resources/start-transfer.json @@ -4,8 +4,8 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PULL" } 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 87b1ce72..a489700d 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 @@ -1,5 +1,5 @@ edc.participant.id=consumer -edc.dsp.callback.address=http://localhost:29194/protocol +edc.dsp.callback.address=http://localhost:29194/protocol/2025-1 web.http.port=29191 web.http.path=/api web.http.management.port=29193 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 6fd27e27..bb94911a 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 @@ -1,5 +1,5 @@ edc.participant.id=provider -edc.dsp.callback.address=http://localhost:19194/protocol +edc.dsp.callback.address=http://localhost:19194/protocol/2025-1 web.http.port=19191 web.http.path=/api web.http.management.port=19193 diff --git a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json index b81e8ed5..f5f59f80 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } \ No newline at end of file diff --git a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json index b6674fe9..3c13ea63 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/"}, "@type": "DatasetRequest", "@id": "1", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } \ No newline at end of file diff --git a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json index d04e405a..91ba44c5 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json @@ -3,8 +3,8 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", diff --git a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json index 0fa94fce..e49492b4 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json @@ -4,9 +4,9 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "AmazonS3-PUSH", "dataDestination": { "type": "AmazonS3", diff --git a/transfer/transfer-06-kafka-broker/4-get-dataset.json b/transfer/transfer-06-kafka-broker/4-get-dataset.json index 0ec57558..ed5ddb8d 100644 --- a/transfer/transfer-06-kafka-broker/4-get-dataset.json +++ b/transfer/transfer-06-kafka-broker/4-get-dataset.json @@ -2,6 +2,6 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "kafka-stream-asset", - "counterPartyAddress": "http://localhost:18182/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json index 9dce9907..c0f68797 100644 --- a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json +++ b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json @@ -3,8 +3,8 @@ "edc": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:18182/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{offerId}}", diff --git a/transfer/transfer-06-kafka-broker/6-transfer.json b/transfer/transfer-06-kafka-broker/6-transfer.json index e30d4f4c..168ba241 100644 --- a/transfer/transfer-06-kafka-broker/6-transfer.json +++ b/transfer/transfer-06-kafka-broker/6-transfer.json @@ -3,11 +3,11 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequest", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "KafkaBroker-PULL", "contractId": "{{contract-agreement-id}}", "connectorId": "provider", - "counterPartyAddress": "http://localhost:18182/protocol", + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", "callbackAddresses": [ { "transactional": false, diff --git a/transfer/transfer-06-kafka-broker/README.md b/transfer/transfer-06-kafka-broker/README.md index 6656e305..8e1aca64 100644 --- a/transfer/transfer-06-kafka-broker/README.md +++ b/transfer/transfer-06-kafka-broker/README.md @@ -131,7 +131,7 @@ The output will be something like: "edc": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ``` diff --git a/transfer/transfer-06-kafka-broker/kafka-runtime/consumer.properties b/transfer/transfer-06-kafka-broker/kafka-runtime/consumer.properties index c8013132..4ec0b58c 100644 --- a/transfer/transfer-06-kafka-broker/kafka-runtime/consumer.properties +++ b/transfer/transfer-06-kafka-broker/kafka-runtime/consumer.properties @@ -8,6 +8,6 @@ web.http.control.port=28183 web.http.control.path=/control web.http.version.port=28184 web.http.version.path=/version -edc.dsp.callback.address=http://localhost:28182/protocol +edc.dsp.callback.address=http://localhost:28182/protocol/2025-1 edc.participant.id=consumer edc.receiver.http.dynamic.endpoint=http://localhost:4000/receiver diff --git a/transfer/transfer-06-kafka-broker/kafka-runtime/provider.properties b/transfer/transfer-06-kafka-broker/kafka-runtime/provider.properties index 706fe3a5..bc3f6446 100644 --- a/transfer/transfer-06-kafka-broker/kafka-runtime/provider.properties +++ b/transfer/transfer-06-kafka-broker/kafka-runtime/provider.properties @@ -8,7 +8,7 @@ web.http.control.port=18183 web.http.control.path=/control web.http.version.port=18184 web.http.version.path=/version -edc.dsp.callback.address=http://localhost:18182/protocol +edc.dsp.callback.address=http://localhost:18182/protocol/2025-1 edc.participant.id=provider edc.ids.id=urn:connector:provider edc.dataplane.http.sink.partition.size=1