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

Jump to bottom

chore: clean JSON-LD context output #335

Merged
merged 1 commit into from
Sep 17, 2024
Merged

chore: clean JSON-LD context output #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions deployment/assets/env/consumer_connector.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7083"
EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5
EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10
EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json"
EDC_MANAGEMENT_CONTEXT_ENABLED=true

# dataplane specific config
EDC_RUNTIME_ID="consumer-embedded-runtime"
Expand Down
1 change: 1 addition & 0 deletions deployment/assets/env/provider_catalogserver.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ EDC_IAM_STS_PRIVATEKEY_ALIAS="did:web:localhost%3A7093-alias"
EDC_IAM_STS_PUBLICKEY_ID="did:web:localhost%3A7093#key-1"
EDC_DSP_CALLBACK_ADDRESS="http://localhost:8092/api/dsp"
EDC_PARTICIPANT_ID="did:web:localhost%3A7093"
EDC_MANAGEMENT_CONTEXT_ENABLED=true
1 change: 1 addition & 0 deletions deployment/assets/env/provider_connector_manufacturing.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7093"
EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5
EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10
EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json"
EDC_MANAGEMENT_CONTEXT_ENABLED=true

# dataplane specific config
EDC_RUNTIME_ID="provider-manufacturing-embedded-runtime"
Expand Down
1 change: 1 addition & 0 deletions deployment/assets/env/provider_connector_qna.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7093"
EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5
EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10
EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json"
EDC_MANAGEMENT_CONTEXT_ENABLED=true

# dataplane specific config
EDC_RUNTIME_ID="provider-qna-embedded-runtime"
Expand Down
3 changes: 2 additions & 1 deletion extensions/dcp-impl/src/main/java/org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.util.Map;
import java.util.Set;

import static org.eclipse.edc.iam.verifiablecredentials.spi.validation.TrustedIssuerRegistry.WILDCARD;
import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;

public class DcpPatchExtension implements ServiceExtension {
Expand Down Expand Up @@ -60,7 +61,7 @@ public void initialize(ServiceExtensionContext context) {
signatureSuiteRegistry.register(VcConstants.JWS_2020_SIGNATURE_SUITE, suite);

// register dataspace issuer
trustedIssuerRegistry.addIssuer(new Issuer("did:example:dataspace-issuer", Map.of()));
trustedIssuerRegistry.register(new Issuer("did:example:dataspace-issuer", Map.of()), WILDCARD);

// register a default scope provider
var contextMappingFunction = new DefaultScopeMappingFunction(Set.of(
Expand Down
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", v
edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
edc-auth-configuration = { module = "org.eclipse.edc:auth-configuration", version.ref = "edc" }
edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
edc-api-management-jsonld-context = { module = "org.eclipse.edc:management-api-json-ld-context", version.ref = "edc" }
edc-api-version = { module = "org.eclipse.edc:version-api", version.ref = "edc" }
edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
edc-api-management-asset = { module = "org.eclipse.edc:asset-api", version.ref = "edc" }
Expand Down Expand Up @@ -166,8 +165,8 @@ dpf = ["edc-dpf-selector-core", "edc-spi-dataplane-selector", "edc-dpf-selector-

connector = ["edc-boot", "edc-core-connector", "edc-ext-http", "edc-ext-observability", "edc-ext-jsonld"]

controlplane = ["edc-controlplane-core", "edc-config-filesystem", "edc-auth-tokenbased", "edc-auth-configuration", "edc-api-management", "edc-api-management-config",
"edc-api-management-jsonld-context","edc-api-management-edr","edc-api-management-dataplaneselector",
controlplane = ["edc-controlplane-core", "edc-config-filesystem", "edc-auth-tokenbased", "edc-auth-configuration", "edc-api-management",
"edc-api-management-config", "edc-api-management-edr","edc-api-management-dataplaneselector",
"edc-api-observability", "edc-dsp", "edc-spi-jwt", "edc-ext-http", "edc-controlplane-callback-dispatcher-event", "edc-controlplane-callback-dispatcher-http",
"edc-identity-core-did", "edc-dcp-core", "edc-identity-trust-transform", "edc-api-control-configuration", "edc-lib-transform",
"edc-identity-vc-ldp", "edc-did-web", "edc-lib-jws2020", "edc-core-edrstore", "edc-edr-storereceiver"]
Expand Down
1 change: 0 additions & 1 deletion launchers/catalog-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies {
runtimeOnly(libs.bundles.connector) // base runtime
runtimeOnly(libs.edc.api.management)
runtimeOnly(libs.edc.api.management.config)
runtimeOnly(libs.edc.api.management.jsonld.context)
runtimeOnly(libs.edc.controlplane.core) //default store impls, etc.
runtimeOnly(libs.edc.controlplane.services) // aggregate services
runtimeOnly(libs.edc.dsp) // protocol webhook
Expand Down
Loading