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 fc475894..0722897e 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 @@ -25,6 +25,8 @@ plugins { dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.api) diff --git a/basic/basic-01-basic-connector/README.md b/basic/basic-01-basic-connector/README.md index bed1a985..9d287136 100644 --- a/basic/basic-01-basic-connector/README.md +++ b/basic/basic-01-basic-connector/README.md @@ -15,6 +15,7 @@ that contains the essential dependencies. We'll need at least the following thin ```kotlin dependencies { implementation(libs.edc.boot) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) } ``` diff --git a/basic/basic-01-basic-connector/build.gradle.kts b/basic/basic-01-basic-connector/build.gradle.kts index 12bffff1..3cbdc93f 100644 --- a/basic/basic-01-basic-connector/build.gradle.kts +++ b/basic/basic-01-basic-connector/build.gradle.kts @@ -21,6 +21,7 @@ plugins { dependencies { implementation(libs.edc.boot) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.http) } diff --git a/basic/basic-02-health-endpoint/build.gradle.kts b/basic/basic-02-health-endpoint/build.gradle.kts index 96a0cb11..a2d5dece 100644 --- a/basic/basic-02-health-endpoint/build.gradle.kts +++ b/basic/basic-02-health-endpoint/build.gradle.kts @@ -21,6 +21,7 @@ plugins { dependencies { implementation(libs.edc.boot) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.http) diff --git a/basic/basic-03-configuration/build.gradle.kts b/basic/basic-03-configuration/build.gradle.kts index 01b56fcc..04475494 100644 --- a/basic/basic-03-configuration/build.gradle.kts +++ b/basic/basic-03-configuration/build.gradle.kts @@ -22,6 +22,7 @@ plugins { dependencies { implementation(libs.edc.boot) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.http) diff --git a/federated-catalog/fc-00-basic/fixed-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java b/federated-catalog/fc-00-basic/fixed-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java index 0424b986..944226db 100644 --- a/federated-catalog/fc-00-basic/fixed-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java +++ b/federated-catalog/fc-00-basic/fixed-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java @@ -17,19 +17,15 @@ import org.eclipse.edc.crawler.spi.TargetNode; import org.eclipse.edc.crawler.spi.TargetNodeDirectory; -import java.util.ArrayList; import java.util.List; public class CatalogNodeDirectory implements TargetNodeDirectory { @Override public List getAll() { - List protocolList = new ArrayList<>(); - protocolList.add("dataspace-protocol-http"); - - TargetNode participantNode = new TargetNode("https://w3id.org/edc/v0.0.1/ns/", + var participantNode = new TargetNode("https://w3id.org/edc/v0.0.1/ns/", "provider", - "http://localhost:19194/protocol", protocolList); + "http://localhost:19194/protocol", List.of("dataspace-protocol-http")); return List.of(participantNode); } @@ -38,4 +34,9 @@ public List getAll() { public void insert(TargetNode targetNode) { } + + @Override + public TargetNode remove(String s) { + return null; + } } diff --git a/federated-catalog/fc-01-embedded/fc-connector/build.gradle.kts b/federated-catalog/fc-01-embedded/fc-connector/build.gradle.kts index 6c2d63b5..a6d6a072 100644 --- a/federated-catalog/fc-01-embedded/fc-connector/build.gradle.kts +++ b/federated-catalog/fc-01-embedded/fc-connector/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { runtimeOnly(project(":federated-catalog:fc-00-basic:federated-catalog-base")) runtimeOnly(project(":federated-catalog:fc-00-basic:fixed-node-resolver")) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.control.plane.core) implementation(libs.edc.configuration.filesystem) diff --git a/federated-catalog/fc-02-standalone/standalone-fc/build.gradle.kts b/federated-catalog/fc-02-standalone/standalone-fc/build.gradle.kts index 5a585fa5..b9d8f643 100644 --- a/federated-catalog/fc-02-standalone/standalone-fc/build.gradle.kts +++ b/federated-catalog/fc-02-standalone/standalone-fc/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { runtimeOnly(project(":federated-catalog:fc-00-basic:federated-catalog-base")) runtimeOnly(project(":federated-catalog:fc-00-basic:fixed-node-resolver")) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) runtimeOnly(libs.edc.boot) runtimeOnly(libs.edc.control.plane.core) diff --git a/federated-catalog/fc-03-static-node-directory/embedded-fc-with-node-resolver/build.gradle.kts b/federated-catalog/fc-03-static-node-directory/embedded-fc-with-node-resolver/build.gradle.kts index c6302151..e26e2c15 100644 --- a/federated-catalog/fc-03-static-node-directory/embedded-fc-with-node-resolver/build.gradle.kts +++ b/federated-catalog/fc-03-static-node-directory/embedded-fc-with-node-resolver/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { runtimeOnly(project(":federated-catalog:fc-00-basic:federated-catalog-base")) runtimeOnly(project(":federated-catalog:fc-03-static-node-directory:target-node-resolver")) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.control.plane.core) implementation(libs.edc.configuration.filesystem) diff --git a/federated-catalog/fc-03-static-node-directory/standalone-fc-with-node-resolver/build.gradle.kts b/federated-catalog/fc-03-static-node-directory/standalone-fc-with-node-resolver/build.gradle.kts index dcac9036..64784249 100644 --- a/federated-catalog/fc-03-static-node-directory/standalone-fc-with-node-resolver/build.gradle.kts +++ b/federated-catalog/fc-03-static-node-directory/standalone-fc-with-node-resolver/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { runtimeOnly(project(":federated-catalog:fc-00-basic:federated-catalog-base")) runtimeOnly(project(":federated-catalog:fc-03-static-node-directory:target-node-resolver")) + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) runtimeOnly(libs.edc.boot) runtimeOnly(libs.edc.control.plane.core) diff --git a/federated-catalog/fc-03-static-node-directory/target-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java b/federated-catalog/fc-03-static-node-directory/target-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java index bd18e106..eb312034 100644 --- a/federated-catalog/fc-03-static-node-directory/target-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java +++ b/federated-catalog/fc-03-static-node-directory/target-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java @@ -46,4 +46,9 @@ public List getAll() { public void insert(TargetNode targetNode) { } + + @Override + public TargetNode remove(String s) { + return null; + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2faf204e..6989ead1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ format.version = "1.1" [versions] awaitility = "4.2.2" -edc = "0.12.0" +edc = "0.13.0" okhttp-mockwebserver = "5.0.0-alpha.14" restAssured = "5.5.2" rsApi = "4.0.0" @@ -50,6 +50,7 @@ edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" } edc-management-api = { module = "org.eclipse.edc:management-api", version.ref = "edc" } edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" } edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" } +edc-runtime-core = { module = "org.eclipse.edc:runtime-core", version.ref = "edc" } edc-token-core = { module = "org.eclipse.edc:token-core", version.ref = "edc" } edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" } edc-vault-hashicorp = { module = "org.eclipse.edc:vault-hashicorp", version.ref = "edc" } diff --git a/policy/policy-01-policy-enforcement/policy-enforcement-consumer/build.gradle.kts b/policy/policy-01-policy-enforcement/policy-enforcement-consumer/build.gradle.kts index 41f118db..62dad32c 100644 --- a/policy/policy-01-policy-enforcement/policy-enforcement-consumer/build.gradle.kts +++ b/policy/policy-01-policy-enforcement/policy-enforcement-consumer/build.gradle.kts @@ -19,6 +19,7 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.control.plane.core) implementation(libs.edc.edr.store.core) diff --git a/policy/policy-01-policy-enforcement/policy-enforcement-provider/build.gradle.kts b/policy/policy-01-policy-enforcement/policy-enforcement-provider/build.gradle.kts index 90b69858..6946cceb 100644 --- a/policy/policy-01-policy-enforcement/policy-enforcement-provider/build.gradle.kts +++ b/policy/policy-01-policy-enforcement/policy-enforcement-provider/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { + implementation(libs.edc.runtime.core) implementation(libs.edc.connector.core) implementation(libs.edc.control.plane.core) implementation(libs.edc.edr.store.core) 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 4d8e0946..3c543dec 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,6 +21,8 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.core) 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 83ab5362..bf4f3f68 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,6 +21,8 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.core) diff --git a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java index fb8a7ce9..ae5261a0 100644 --- a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java +++ b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java @@ -36,6 +36,12 @@ public boolean canHandle(TransferProcess transferProcess) { return KAFKA_TYPE.equals(transferProcess.getContentDataAddress().getType()) && "KafkaBroker-PULL".equals(transferProcess.getTransferType()); } + @Override + public StatusResult provision(TransferProcess transferProcess, Policy policy) { + // here the flow can be provisioned, not something covered in this sample + return StatusResult.success(null); + } + @Override public @NotNull StatusResult start(TransferProcess transferProcess, Policy policy) { // static credentials, in a production case these should be created dynamically and an ACLs entry should be added diff --git a/transfer/transfer-00-prerequisites/connector/build.gradle.kts b/transfer/transfer-00-prerequisites/connector/build.gradle.kts index d32116f4..0b779190 100644 --- a/transfer/transfer-00-prerequisites/connector/build.gradle.kts +++ b/transfer/transfer-00-prerequisites/connector/build.gradle.kts @@ -19,6 +19,8 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.api) 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 e5748dcd..450b7c87 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 @@ -19,6 +19,8 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.api) diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts index 5470705f..330ae680 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts @@ -21,6 +21,8 @@ plugins { } dependencies { + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.api) diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts index eb3398c6..4c8cdf84 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts @@ -21,9 +21,10 @@ plugins { } dependencies { - implementation(project(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud")) + implementation(libs.edc.runtime.core) + implementation(libs.edc.connector.core) implementation(libs.edc.control.api.configuration) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.control.plane.api)