diff --git a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts index 6a243fcb478..49613700670 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts @@ -6,6 +6,7 @@ plugins { dependencies { api(project(":spi:common:identity-trust-spi")) implementation(project(":spi:common:http-spi")) + implementation(project(":spi:common:json-ld-spi")) implementation(project(":core:common:util")) implementation(project(":core:common:jwt-core")) implementation(project(":extensions:common:crypto:jws2020")) diff --git a/spi/common/identity-trust-spi/build.gradle.kts b/spi/common/identity-trust-spi/build.gradle.kts index c6561a075de..3a91dd60aa3 100644 --- a/spi/common/identity-trust-spi/build.gradle.kts +++ b/spi/common/identity-trust-spi/build.gradle.kts @@ -20,7 +20,6 @@ plugins { dependencies { api(project(":spi:common:core-spi")) - api(project(":spi:common:json-ld-spi")) api(libs.iron.vc) { //this is not on MavenCentral, and we don't really need it anyway exclude("com.github.multiformats") diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java index b562999c3fc..a3b7ff056d4 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java @@ -14,11 +14,9 @@ package org.eclipse.edc.identitytrust.model; -import org.eclipse.edc.jsonld.spi.JsonLdKeywords; - import java.util.Map; public record CredentialStatus(String id, String type, Map additionalProperties) { - public static final String CREDENTIAL_STATUS_ID_PROPERTY = JsonLdKeywords.ID; - public static final String CREDENTIAL_STATUS_TYPE_PROPERTY = JsonLdKeywords.TYPE; + public static final String CREDENTIAL_STATUS_ID_PROPERTY = "@id"; + public static final String CREDENTIAL_STATUS_TYPE_PROPERTY = "@type"; } diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java index 4f89da0968d..26b7c0f9d5d 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java @@ -22,6 +22,7 @@ * @param presentation the {@link VerifiablePresentation}, as it was deserialized from the raw VP string. Note that JSON-LD and JWT VCs * have to be deserialized differently */ -public record VerifiablePresentationContainer(String rawVp, CredentialFormat format, +public record VerifiablePresentationContainer(String rawVp, + CredentialFormat format, VerifiablePresentation presentation) { }