From 50572f6220707e91cb64ebd67917e08abf4797fa Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Mon, 16 Sep 2024 08:56:41 +0200 Subject: [PATCH] cleanup dependencies --- .../open-telemetry-runtime/build.gradle.kts | 3 ++- gradle/libs.versions.toml | 22 ++----------------- .../streaming-01-runtime/build.gradle.kts | 1 + .../streaming-02-runtime/build.gradle.kts | 1 + .../streaming-03-runtime/build.gradle.kts | 1 + .../connector/build.gradle.kts | 2 +- .../consumer-with-listener/build.gradle.kts | 2 +- .../cloud-transfer-consumer/build.gradle.kts | 2 +- .../cloud-transfer-provider/build.gradle.kts | 2 +- .../transfer-file-cloud/build.gradle.kts | 2 +- 10 files changed, 12 insertions(+), 26 deletions(-) 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 8f66bec3..c93abf63 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,6 +31,7 @@ dependencies { implementation(libs.edc.control.plane.core) implementation(libs.edc.dsp) + implementation(libs.edc.http) implementation(libs.edc.configuration.filesystem) implementation(libs.edc.iam.mock) @@ -42,7 +43,7 @@ dependencies { implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.data.plane.self.registration) - implementation(libs.edc.data.plane.control.api) + implementation(libs.edc.data.plane.signaling.api) implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a20fc1e..7413e0d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,11 +2,8 @@ format.version = "1.1" [versions] -assertj = "3.26.3" awaitility = "4.2.2" edc = "0.9.0" -jakarta-json = "2.0.1" -junit-pioneer = "2.2.0" jupiter = "5.11.0" okhttp-mockwebserver = "5.0.0-alpha.14" restAssured = "5.5.0" @@ -15,9 +12,7 @@ testcontainers = "1.20.1" kafkaClients = "3.8.0" [libraries] -assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" } -edc-api-core = { module = "org.eclipse.edc:api-core", version.ref = "edc" } 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" } @@ -29,11 +24,11 @@ edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-cli edc-control-plane-api = { module = "org.eclipse.edc:control-plane-api", version.ref = "edc" } edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" } edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" } -edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "edc" } +edc-data-plane-signaling-api = { module = "org.eclipse.edc:data-plane-signaling-api", version.ref = "edc" } +edc-data-plane-signaling-client = { module = "org.eclipse.edc:data-plane-signaling-client", version.ref = "edc" } edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" } edc-data-plane-aws-s3 = { module = "org.eclipse.edc.aws:data-plane-aws-s3", version.ref = "edc" } edc-data-plane-azure-storage = { module = "org.eclipse.edc.azure:data-plane-azure-storage", version.ref = "edc" } -edc-data-plane-client = { module = "org.eclipse.edc:data-plane-client", version.ref = "edc" } edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" } edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" } edc-data-plane-kafka = { module = "org.eclipse.edc:data-plane-kafka", version.ref = "edc" } @@ -41,45 +36,32 @@ edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-ap edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" } edc-data-plane-self-registration = { module = "org.eclipse.edc:data-plane-self-registration", version.ref = "edc" } edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" } -edc-data-plane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" } edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" } edc-edr-cache-api = { module = "org.eclipse.edc:edr-cache-api", version.ref = "edc" } edc-edr-store-core = { module = "org.eclipse.edc:edr-store-core", version.ref = "edc" } edc-edr-store-receiver = { module = "org.eclipse.edc:edr-store-receiver", version.ref = "edc" } edc-http = { module = "org.eclipse.edc:http", version.ref = "edc" } edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" } -edc-jersey-micrometer = { module = "org.eclipse.edc:jersey-micrometer", version.ref = "edc" } -edc-jetty-micrometer = { module = "org.eclipse.edc:jetty-micrometer", version.ref = "edc" } edc-json-ld-lib = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc" } edc-json-ld-spi = { module = "org.eclipse.edc:json-ld-spi", version.ref = "edc" } 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-micrometer-core = { module = "org.eclipse.edc:micrometer-core", version.ref = "edc" } edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" } -edc-provision-aws-s3 = { module = "org.eclipse.edc.aws:provision-aws-s3", version.ref = "edc" } -edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" } edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" } -edc-transfer-process-api = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" } edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" } edc-transfer-pull-http-dynamic-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" } -edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" } -edc-vault-azure = { module = "org.eclipse.edc.azure:vault-azure", version.ref = "edc" } edc-vault-hashicorp = { module = "org.eclipse.edc:vault-hashicorp", version.ref = "edc" } edc-validator-data-address-http-data = { module = "org.eclipse.edc:validator-data-address-http-data", version.ref = "edc" } jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" } -jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" } -junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jupiter" } -junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" } okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp-mockwebserver" } opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version = "1.18.0" } opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version = "1.41.0" } opentelemetry-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent", version = "2.7.0" } restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" } testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } -testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } kafka-clients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafkaClients" } testcontainers-kafka = { module = "org.testcontainers:kafka", version.ref = "testcontainers" } testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } 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 7557a2b3..741ad74f 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 @@ -30,6 +30,7 @@ dependencies { 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.data.plane.spi) 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 5e6c8c53..e2e80757 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 @@ -30,6 +30,7 @@ dependencies { 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.data.plane.spi) 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 537c3e85..dfd2b529 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 @@ -27,6 +27,7 @@ dependencies { 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.transfer.pull.http.dynamic.receiver) diff --git a/transfer/transfer-00-prerequisites/connector/build.gradle.kts b/transfer/transfer-00-prerequisites/connector/build.gradle.kts index 5018d8b4..fbe3aaa9 100644 --- a/transfer/transfer-00-prerequisites/connector/build.gradle.kts +++ b/transfer/transfer-00-prerequisites/connector/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.data.plane.self.registration) - implementation(libs.edc.data.plane.control.api) + implementation(libs.edc.data.plane.signaling.api) implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) 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 2e116f41..1b91f66a 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 @@ -33,7 +33,7 @@ dependencies { implementation(libs.edc.data.plane.selector.api) implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.data.plane.control.api) + implementation(libs.edc.data.plane.signaling.api) implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) 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 fc088f38..30ae652e 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 @@ -37,7 +37,7 @@ dependencies { implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.data.plane.self.registration) - implementation(libs.edc.data.plane.control.api) + implementation(libs.edc.data.plane.signaling.api) implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) 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 525bfb64..f2965b9c 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 @@ -40,7 +40,7 @@ dependencies { implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.data.plane.self.registration) - implementation(libs.edc.data.plane.control.api) + implementation(libs.edc.data.plane.signaling.api) implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) diff --git a/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts index e717775e..6f260ee4 100644 --- a/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.azure.storage) implementation(libs.edc.data.plane.aws.s3) - implementation(libs.edc.data.plane.client) + implementation(libs.edc.data.plane.signaling.client) implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.transfer.data.plane.signaling)