Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump EDC to 0.9.0 #316

Merged
merged 2 commits into from
Sep 16, 2024
Merged

build(deps): bump EDC to 0.9.0 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c846532
build(deps): bump EDC to 0.9.0
ndr-brt Sep 16, 2024
645ce89
cleanup dependencies
ndr-brt Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -42,10 +43,11 @@ 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)
implementation(libs.edc.data.plane.iam)

implementation(libs.edc.api.observability)
implementation(libs.edc.auth.tokenbased)
Expand Down
25 changes: 4 additions & 21 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
format.version = "1.1"

[versions]
assertj = "3.26.3"
awaitility = "4.2.2"
edc = "0.8.1"
jakarta-json = "2.0.1"
junit-pioneer = "2.2.0"
edc = "0.9.0"
jupiter = "5.11.0"
okhttp-mockwebserver = "5.0.0-alpha.14"
restAssured = "5.5.0"
Expand All @@ -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" }
Expand All @@ -29,57 +24,45 @@ 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-iam = { module = "org.eclipse.edc:data-plane-iam", version.ref = "edc" }
edc-data-plane-kafka = { module = "org.eclipse.edc:data-plane-kafka", version.ref = "edc" }
edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
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" }
Expand Down
17 changes: 0 additions & 17 deletions ...tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
import org.eclipse.edc.junit.extensions.RuntimeExtension;
import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.containers.GenericContainer;
Expand Down Expand Up @@ -80,22 +79,6 @@ public class Transfer05fileTransferCloudTest {
private static final String VAULT_TOKEN = "<root-token>";
private static final int VAULT_PORT = 8200;


@AfterAll
static void tearDown() {

if (vaultContainer != null) {
vaultContainer.stop();
}
if (azuriteContainer != null) {
azuriteContainer.stop();
}
if (minioContainer != null) {
minioContainer.stop();
}

}

@Container
protected static VaultContainer<?> vaultContainer = new VaultContainer<>(DockerImageName.parse(VAULT_IMAGE_NAME))
.withExposedPorts(VAULT_PORT)
Expand Down
1 change: 1 addition & 0 deletions transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/consumer.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ web.http.protocol.path=/protocol
web.http.control.port=28183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:28182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/provider.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ web.http.protocol.path=/protocol
web.http.control.port=18183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:18182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=provider
edc.ids.id=urn:connector:provider
edc.dataplane.http.sink.partition.size=1
1 change: 1 addition & 0 deletions transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/consumer.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ web.http.protocol.path=/protocol
web.http.control.port=28183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:28182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/provider.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ web.http.protocol.path=/protocol
web.http.control.port=18183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:18182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=provider
edc.ids.id=urn:connector:provider
edc.dataplane.http.sink.partition.size=1
1 change: 1 addition & 0 deletions transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/consumer.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ web.http.protocol.path=/protocol
web.http.control.port=28183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:28182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=consumer
edc.receiver.http.dynamic.endpoint=http://localhost:4000/receiver
2 changes: 0 additions & 2 deletions transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/provider.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ web.http.protocol.path=/protocol
web.http.control.port=18183
web.http.control.path=/control
edc.dsp.callback.address=http://localhost:18182/protocol
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.participant.id=provider
edc.ids.id=urn:connector:provider
edc.dataplane.http.sink.partition.size=1
Expand Down
4 changes: 3 additions & 1 deletion transfer/transfer-00-prerequisites/connector/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
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)
Expand All @@ -39,10 +40,11 @@ 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)
implementation(libs.edc.data.plane.iam)
}

application {
Expand Down
2 changes: 1 addition & 1 deletion transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
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)
Expand All @@ -37,7 +38,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)
Expand Down
4 changes: 1 addition & 3 deletions transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ web.http.management.path=/management
web.http.protocol.port=29194
web.http.protocol.path=/protocol
edc.api.auth.key=password
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
web.http.public.port=29291
web.http.public.path=/public
web.http.control.port=29192
web.http.control.path=/control
web.http.control.path=/control
3 changes: 2 additions & 1 deletion transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
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)
Expand All @@ -40,7 +41,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)
Expand Down
4 changes: 1 addition & 3 deletions transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ web.http.management.path=/management
web.http.protocol.port=19194
web.http.protocol.path=/protocol
edc.api.auth.key=password
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
web.http.public.port=19291
web.http.public.path=/public
web.http.control.port=19192
Expand All @@ -22,4 +20,4 @@ edc.vault.hashicorp.health.check.enabled=false
edc.blobstore.endpoint.template=http://127.0.0.1:10000/%s

edc.aws.access.key=accessKeyId
edc.aws.secret.access.key=secretAccessKey
edc.aws.secret.access.key=secretAccessKey
2 changes: 1 addition & 1 deletion transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading