From a3508e0a2feb0293fc4ea3646c1d6ee2178747a1 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Mon, 28 Oct 2024 11:13:01 +0100 Subject: [PATCH] fix compilation errors --- .../docker-compose.yaml | 4 ++ .../open-telemetry-runtime/build.gradle.kts | 12 +---- gradle/libs.versions.toml | 2 + policy/policy-01-policy-enforcement/README.md | 35 +++++++------- .../build.gradle.kts | 8 +--- .../config.properties | 4 +- .../build.gradle.kts | 8 +--- .../config.properties | 2 + .../policy/LocationConstraintFunction.java | 13 +++-- .../policy/PolicyFunctionsExtension.java | 5 +- .../Transfer05fileTransferCloudTest.java | 47 ++++++++++--------- .../streaming-01-runtime/build.gradle.kts | 13 ++--- .../streaming-01-runtime/consumer.properties | 2 + .../streaming-01-runtime/provider.properties | 2 + .../streaming-02-runtime/build.gradle.kts | 13 ++--- .../streaming-02-runtime/consumer.properties | 2 + .../streaming-02-runtime/provider.properties | 2 + .../streaming-03-runtime/build.gradle.kts | 17 +++---- .../streaming-03-runtime/consumer.properties | 2 + .../streaming-03-runtime/provider.properties | 2 + .../connector/build.gradle.kts | 9 ++-- .../consumer-configuration.properties | 2 + .../provider-configuration.properties | 2 + 23 files changed, 100 insertions(+), 108 deletions(-) diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml index 91d7d413..7358e4b9 100644 --- a/advanced/advanced-01-open-telemetry/docker-compose.yaml +++ b/advanced/advanced-01-open-telemetry/docker-compose.yaml @@ -28,6 +28,8 @@ services: WEB_HTTP_MANAGEMENT_PATH: /management WEB_HTTP_PROTOCOL_PORT: 29194 WEB_HTTP_PROTOCOL_PATH: /protocol + 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_PARTICIPANT_ID: consumer @@ -65,6 +67,8 @@ services: WEB_HTTP_MANAGEMENT_PATH: /management WEB_HTTP_PROTOCOL_PORT: 19194 WEB_HTTP_PROTOCOL_PATH: /protocol + 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_PARTICIPANT_ID: provider 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 fcc6faa1..279d9e69 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 @@ -24,18 +24,11 @@ plugins { } dependencies { - + implementation(libs.edc.bom.controlplane.base) implementation(libs.edc.control.api.configuration) - implementation(libs.edc.control.plane.api.client) - implementation(libs.edc.control.plane.api) - implementation(libs.edc.control.plane.core) - - implementation(libs.edc.dsp) - implementation(libs.edc.http) - implementation(libs.edc.configuration.filesystem) implementation(libs.edc.iam.mock) - implementation(libs.edc.management.api) + implementation(libs.edc.transfer.data.plane.signaling) implementation(libs.edc.transfer.pull.http.receiver) @@ -49,7 +42,6 @@ dependencies { implementation(libs.edc.data.plane.http) implementation(libs.edc.data.plane.iam) - implementation(libs.edc.api.observability) implementation(libs.edc.auth.tokenbased) implementation(libs.opentelemetry.exporter.otlp) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8d482258..c7f6b2d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,8 @@ awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" } edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" } edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" } +edc-bom-controlplane-base = { module = "org.eclipse.edc:controlplane-base-bom", version.ref = "edc" } +edc-bom-dataplane-base = { module = "org.eclipse.edc:dataplane-base-bom", version.ref = "edc" } edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" } edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" } edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" } diff --git a/policy/policy-01-policy-enforcement/README.md b/policy/policy-01-policy-enforcement/README.md index cdde3832..bad9f7b3 100644 --- a/policy/policy-01-policy-enforcement/README.md +++ b/policy/policy-01-policy-enforcement/README.md @@ -37,25 +37,25 @@ When creating a rule binding, we can bind an action type or constraint to either Here, we bind the action type `use` to all scopes, so that rules with this action type are always evaluated. For the location constraint we choose the negotiation scope, meaning it will only be evaluated during the contract negotiation. Information on available scopes can be found -[here](https://github.com/eclipse-edc/Connector/blob/main/docs/developer/policy-engine.md). +[here](https://eclipse-edc.github.io/documentation/for-adopters/control-plane/policy-engine/). ### Implementing the function for evaluation With the rule bindings in place, the provider will now try to evaluate our policy including the constraint during a contract negotiation, but it does not yet know *how* to evaluate this constraint. For this, we need to implement a -function, for which the EDC offer two interfaces: `AtomicConstraintFunction` and `RuleFunction`. The former is meant -for evaluating a single constraint of a rule, while is latter is meant for evaluating a complete rule node (including -constraints as well as duties that may be associated with a permission). For our example, we choose to implement an -`AtomicConstraintFunction`, as we want to evaluate our location constraint: +function, for which the EDC offer two interfaces: `AtomicConstraintRuleFunction` and `PolicyRuleFunction`. The former is +meant for evaluating a single constraint of a rule, while is latter is meant for evaluating a complete rule node +(including constraints as well as duties that may be associated with a permission). For our example, we choose to +implement an `AtomicConstraintRuleFunction`, as we want to evaluate our location constraint: ```java -public class LocationConstraintFunction implements AtomicConstraintFunction { +public class LocationConstraintFunction implements AtomicConstraintRuleFunction { //... @Override - public boolean evaluate(Operator operator, Object rightValue, Permission rule, PolicyContext context) { - var region = context.getContextData(ParticipantAgent.class).getClaims().get("region"); + public boolean evaluate(Operator operator, Object rightValue, Permission rule, ContractNegotiationPolicyContext context) { + var region = context.participantAgent().getClaims().get("region"); monitor.info(format("Evaluating constraint: location %s %s", operator, rightValue.toString())); @@ -70,12 +70,13 @@ public class LocationConstraintFunction implements AtomicConstraintFunction { +public class LocationConstraintFunction implements AtomicConstraintRuleFunction { private final Monitor monitor; @@ -35,8 +34,8 @@ public LocationConstraintFunction(Monitor monitor) { } @Override - public boolean evaluate(Operator operator, Object rightValue, Permission rule, PolicyContext context) { - var region = context.getContextData(ParticipantAgent.class).getClaims().get("region"); + public boolean evaluate(Operator operator, Object rightValue, Permission rule, ContractNegotiationPolicyContext context) { + var region = context.participantAgent().getClaims().get("region"); monitor.info(format("Evaluating constraint: location %s %s", operator, rightValue.toString())); @@ -47,4 +46,4 @@ public boolean evaluate(Operator operator, Object rightValue, Permission rule, P default -> false; }; } -} \ No newline at end of file +} diff --git a/policy/policy-01-policy-enforcement/policy-functions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java b/policy/policy-01-policy-enforcement/policy-functions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java index 0d1018d7..85f80c09 100644 --- a/policy/policy-01-policy-enforcement/policy-functions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java +++ b/policy/policy-01-policy-enforcement/policy-functions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java @@ -14,6 +14,7 @@ package org.eclipse.edc.sample.extension.policy; +import org.eclipse.edc.connector.controlplane.contract.spi.policy.ContractNegotiationPolicyContext; import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.policy.engine.spi.RuleBindingRegistry; import org.eclipse.edc.policy.model.Permission; @@ -21,7 +22,7 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.NEGOTIATION_SCOPE; +import static org.eclipse.edc.connector.controlplane.contract.spi.policy.ContractNegotiationPolicyContext.NEGOTIATION_SCOPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_USE_ACTION_ATTRIBUTE; import static org.eclipse.edc.policy.engine.spi.PolicyEngine.ALL_SCOPES; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; @@ -45,6 +46,6 @@ public void initialize(ServiceExtensionContext context) { ruleBindingRegistry.bind(ODRL_USE_ACTION_ATTRIBUTE, ALL_SCOPES); ruleBindingRegistry.bind(LOCATION_CONSTRAINT_KEY, NEGOTIATION_SCOPE); - policyEngine.registerFunction(ALL_SCOPES, Permission.class, LOCATION_CONSTRAINT_KEY, new LocationConstraintFunction(monitor)); + policyEngine.registerFunction(ContractNegotiationPolicyContext.class, Permission.class, LOCATION_CONSTRAINT_KEY, new LocationConstraintFunction(monitor)); } } 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 bf90d45e..3023f68f 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 @@ -38,6 +38,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; +import static java.util.Map.entry; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import static org.eclipse.edc.samples.common.FileTransferCloudCommon.runNegotiation; @@ -116,28 +117,30 @@ EDC_FS_CONFIG, getFileFromRelativePath(CLOUD_CONSUMER_CONFIG_PROPERTIES_FILE_PAT protected static RuntimeExtension provider = new RuntimePerClassExtension(new EmbeddedRuntime( PROVIDER, Map.ofEntries( - Map.entry("edc.participant.id", "provider"), - Map.entry("edc.dsp.callback.address", "http://localhost:19194/protocol"), - Map.entry("web.http.port", "19191"), - Map.entry("web.http.path", "/api"), - Map.entry("web.http.management.port", "19193"), - Map.entry("web.http.management.path", "/management"), - Map.entry("web.http.protocol.port", "19194"), - Map.entry("web.http.protocol.path", "/protocol"), - Map.entry("edc.api.auth.key", "password"), - Map.entry("edc.transfer.proxy.token.signer.privatekey.alias", "private-key"), - Map.entry("edc.transfer.proxy.token.verifier.publickey.alias", "public-key"), - Map.entry("web.http.public.port", "19291"), - Map.entry("web.http.public.path", "/public"), - Map.entry("web.http.control.port", "19192"), - Map.entry("web.http.control.path", "/control"), - Map.entry("edc.vault.hashicorp.url", "http://127.0.0.1:" + getVaultPort()), - Map.entry("edc.vault.hashicorp.token", ""), - Map.entry("edc.vault.hashicorp.api.secret.path", "/v1/secret"), - Map.entry("edc.vault.hashicorp.health.check.enabled", "false"), - Map.entry("edc.blobstore.endpoint.template", "http://127.0.0.1:" + getAzuritePort() + "/%s"), - Map.entry("edc.aws.access.key", "accessKeyId"), - Map.entry("edc.aws.secret.access.key", "secretAccessKey") + entry("edc.participant.id", "provider"), + entry("edc.dsp.callback.address", "http://localhost:19194/protocol"), + entry("web.http.port", "19191"), + entry("web.http.path", "/api"), + entry("web.http.management.port", "19193"), + entry("web.http.management.path", "/management"), + entry("web.http.protocol.port", "19194"), + entry("web.http.protocol.path", "/protocol"), + entry("web.http.version.port", "19195"), + entry("web.http.version.path", "/version"), + entry("edc.api.auth.key", "password"), + entry("edc.transfer.proxy.token.signer.privatekey.alias", "private-key"), + entry("edc.transfer.proxy.token.verifier.publickey.alias", "public-key"), + entry("web.http.public.port", "19291"), + entry("web.http.public.path", "/public"), + entry("web.http.control.port", "19192"), + entry("web.http.control.path", "/control"), + entry("edc.vault.hashicorp.url", "http://127.0.0.1:" + getVaultPort()), + entry("edc.vault.hashicorp.token", ""), + entry("edc.vault.hashicorp.api.secret.path", "/v1/secret"), + entry("edc.vault.hashicorp.health.check.enabled", "false"), + entry("edc.blobstore.endpoint.template", "http://127.0.0.1:" + getAzuritePort() + "/%s"), + entry("edc.aws.access.key", "accessKeyId"), + entry("edc.aws.secret.access.key", "secretAccessKey") ), PROVIDER_MODULE_PATH )); diff --git a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts index 741ad74f..2bbdbd6f 100644 --- a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts @@ -21,18 +21,11 @@ plugins { } dependencies { + implementation(libs.edc.bom.controlplane.base) implementation(libs.edc.control.api.configuration) - implementation(libs.edc.control.plane.api.client) - implementation(libs.edc.control.plane.core) - implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.api.observability) - implementation(libs.edc.configuration.filesystem) + implementation(libs.edc.iam.mock) - implementation(libs.edc.management.api) - implementation(libs.edc.dsp) - implementation(libs.edc.http) - implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.transfer.data.plane.signaling) + implementation(libs.edc.control.plane.api.client) implementation(libs.edc.data.plane.spi) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.self.registration) diff --git a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/consumer.properties b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/consumer.properties index a778cd4d..a5779078 100644 --- a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/consumer.properties +++ b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/consumer.properties @@ -6,6 +6,8 @@ web.http.protocol.port=28182 web.http.protocol.path=/protocol 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.participant.id=consumer edc.ids.id=urn:connector:consumer diff --git a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/provider.properties b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/provider.properties index a357378a..4d06c1ad 100644 --- a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/provider.properties +++ b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/provider.properties @@ -6,6 +6,8 @@ web.http.protocol.port=18182 web.http.protocol.path=/protocol 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.participant.id=provider edc.ids.id=urn:connector:provider diff --git a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts index e2e80757..bbbc38ac 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts @@ -21,18 +21,11 @@ plugins { } dependencies { + implementation(libs.edc.bom.controlplane.base) implementation(libs.edc.control.api.configuration) - implementation(libs.edc.control.plane.api.client) - implementation(libs.edc.control.plane.core) - implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.api.observability) - implementation(libs.edc.configuration.filesystem) + implementation(libs.edc.iam.mock) - implementation(libs.edc.management.api) - implementation(libs.edc.dsp) - implementation(libs.edc.http) - implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.transfer.data.plane.signaling) + implementation(libs.edc.control.plane.api.client) implementation(libs.edc.data.plane.spi) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.self.registration) diff --git a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/consumer.properties b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/consumer.properties index a778cd4d..a5779078 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/consumer.properties +++ b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/consumer.properties @@ -6,6 +6,8 @@ web.http.protocol.port=28182 web.http.protocol.path=/protocol 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.participant.id=consumer edc.ids.id=urn:connector:consumer diff --git a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/provider.properties b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/provider.properties index a357378a..4d06c1ad 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/provider.properties +++ b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/provider.properties @@ -6,6 +6,8 @@ web.http.protocol.port=18182 web.http.protocol.path=/protocol 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.participant.id=provider edc.ids.id=urn:connector:provider diff --git a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts index dfd2b529..4d3954d9 100644 --- a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts @@ -19,20 +19,15 @@ plugins { } dependencies { - implementation(libs.edc.control.plane.api.client) - implementation(libs.edc.control.plane.core) - implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.api.observability) - implementation(libs.edc.configuration.filesystem) - implementation(libs.edc.iam.mock) - implementation(libs.edc.management.api) - implementation(libs.edc.dsp) - implementation(libs.edc.http) - implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.transfer.data.plane.signaling) + implementation(libs.edc.bom.controlplane.base) + implementation(libs.edc.control.api.configuration) implementation(libs.edc.transfer.pull.http.dynamic.receiver) + + implementation(libs.edc.iam.mock) + implementation(libs.edc.control.plane.api.client) implementation(libs.edc.data.plane.spi) implementation(libs.edc.data.plane.core) + implementation(libs.edc.data.plane.self.registration) implementation(libs.edc.data.plane.http) implementation(libs.edc.data.plane.kafka) } diff --git a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/consumer.properties b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/consumer.properties index da471ae1..c8013132 100644 --- a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/consumer.properties +++ b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/consumer.properties @@ -6,6 +6,8 @@ web.http.protocol.port=28182 web.http.protocol.path=/protocol 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.participant.id=consumer edc.receiver.http.dynamic.endpoint=http://localhost:4000/receiver diff --git a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/provider.properties b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/provider.properties index a06dcb9f..706fe3a5 100644 --- a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/provider.properties +++ b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/provider.properties @@ -6,6 +6,8 @@ web.http.protocol.port=18182 web.http.protocol.path=/protocol 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.participant.id=provider edc.ids.id=urn:connector:provider diff --git a/transfer/transfer-00-prerequisites/connector/build.gradle.kts b/transfer/transfer-00-prerequisites/connector/build.gradle.kts index b3c2902e..a8b31828 100644 --- a/transfer/transfer-00-prerequisites/connector/build.gradle.kts +++ b/transfer/transfer-00-prerequisites/connector/build.gradle.kts @@ -19,13 +19,10 @@ plugins { } dependencies { - implementation(libs.edc.control.api.configuration) + implementation(libs.edc.bom.controlplane.base) implementation(libs.edc.control.plane.api.client) - implementation(libs.edc.control.plane.api) - implementation(libs.edc.control.plane.core) - implementation(libs.edc.dsp) - implementation(libs.edc.http) - implementation(libs.edc.configuration.filesystem) + implementation(libs.edc.control.api.configuration) + implementation(libs.edc.iam.mock) implementation(libs.edc.management.api) implementation(libs.edc.transfer.data.plane.signaling) diff --git a/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties index 5b2059ad..37e27eed 100644 --- a/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties +++ b/transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties @@ -12,3 +12,5 @@ web.http.public.port=29291 web.http.public.path=/public web.http.control.port=29192 web.http.control.path=/control +web.http.version.port=29195 +web.http.version.path=/version diff --git a/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties b/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties index 733d735a..7f0dffd5 100644 --- a/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties +++ b/transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties @@ -12,4 +12,6 @@ web.http.public.port=19291 web.http.public.path=/public web.http.control.port=19192 web.http.control.path=/control +web.http.version.port=19195 +web.http.version.path=/version edc.dataplane.api.public.baseurl=http://localhost:19291/public