Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions advanced/advanced-01-open-telemetry/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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
WEB_HTTP_SIGNALING_PORT: 29195
WEB_HTTP_SIGNALING_PATH: /signaling
EDC_CONTROL_ENDPOINT: http://consumer:29192/control
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol
EDC_PARTICIPANT_ID: consumer
Expand Down Expand Up @@ -69,8 +69,8 @@ services:
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
WEB_HTTP_PROTOCOL_PORT: 19194
WEB_HTTP_PROTOCOL_PATH: /protocol
WEB_HTTP_VERSION_PORT: 19195
WEB_HTTP_VERSION_PATH: /version
WEB_HTTP_SIGNALING_PORT: 19195
WEB_HTTP_SIGNALING_PATH: /signaling
EDC_CONTROL_ENDPOINT: http://provider:19192/control
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol
EDC_PARTICIPANT_ID: provider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ web.http.public.port=29291
web.http.public.path=/public
web.http.control.port=29192
web.http.control.path=/control
web.http.signaling.port=29195
web.http.signaling.path=/signaling
edc.dataplane.api.public.baseurl=http://localhost:29291/public

web.http.management.auth.key=password
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ format.version = "1.1"

[versions]
awaitility = "4.2.2"
edc = "0.17.0"
edc = "0.18.0"
okhttp-mockwebserver = "5.4.0"
restAssured = "6.0.0"
rsApi = "4.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ web.http.protocol.port=29194
web.http.protocol.path=/protocol
web.http.config.port=29195
web.http.config.path=/config
web.http.signaling.port=29196
web.http.signaling.path=/signaling

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ web.http.protocol.port=19194
web.http.protocol.path=/protocol
web.http.control.port=19195
web.http.control.path=/control
web.http.signaling.port=19196
web.http.signaling.path=/signaling

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:19194/protocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ plugins {
}

dependencies {
runtimeOnly(libs.edc.bom.controlplane.base)
runtimeOnly(libs.edc.bom.controlplane.base) {
exclude(group = "org.eclipse.edc", module = "data-plane-signaling-core")
exclude(group = "org.eclipse.edc", module = "data-plane-signaling-oauth2")
}
implementation(libs.edc.control.plane.api.client)
implementation(libs.edc.iam.mock)
implementation(libs.edc.transfer.data.plane.signaling)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ web.http.management.port=29193
web.http.management.path=/management
web.http.protocol.port=29194
web.http.protocol.path=/protocol
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\
web.http.signaling.port=29196
web.http.signaling.path=/signaling
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ web.http.management.port=19193
web.http.management.path=/management
web.http.protocol.port=19194
web.http.protocol.path=/protocol
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
web.http.control.path=/control
web.http.signaling.port=19195
web.http.signaling.path=/signaling
edc.transfer.proxy.token.signer.privatekey.alias=private-key
edc.transfer.proxy.token.verifier.publickey.alias=public-key
edc.dataplane.api.public.baseurl=http://localhost:19291/public
Original file line number Diff line number Diff line change
Expand Up @@ -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.signaling.port=19195
web.http.signaling.path=/signaling
edc.dataplane.proxy.public.endpoint=http://localhost:19291/public
Loading