From a5b3a5351e037b6a4e811d5cdab459eab24025d6 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Thu, 23 Apr 2026 11:50:27 +0200 Subject: [PATCH] chore: use VCDM2.0/JOSE by default --- .../Make Credential Request.bru | 4 ++-- .../create Credential Definition.bru | 2 +- k8s/consumer/application/identityhub-seed.yaml | 4 ++-- k8s/issuer/application/issuerservice-seed-job.yaml | 14 ++++++++++++-- k8s/provider/application/identityhub-seed.yaml | 4 ++-- .../issuance/CredentialIssuanceEndToEndTest.java | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Requests/IdentityHub/VerifiableCredential Mgmt API/Make Credential Request.bru b/Requests/IdentityHub/VerifiableCredential Mgmt API/Make Credential Request.bru index 4b9427e2a..bf09ce0bb 100644 --- a/Requests/IdentityHub/VerifiableCredential Mgmt API/Make Credential Request.bru +++ b/Requests/IdentityHub/VerifiableCredential Mgmt API/Make Credential Request.bru @@ -15,12 +15,12 @@ body:json { "issuerDid": "{{ISSUER_DID}}", "holderPid": "{{$guid}}", "credentials": [{ - "format": "VC1_0_JWT", + "format": "VC2_0_JOSE", "type": "MembershipCredential", "id": "membership-credential-def" }, { - "format": "VC1_0_JWT", + "format": "VC2_0_JOSE", "type": "ManufacturerCredential", "id": "manufacturer-credential-def" }] diff --git a/Requests/IssuerService/Admin API/CredentialDefinitions/create Credential Definition.bru b/Requests/IssuerService/Admin API/CredentialDefinitions/create Credential Definition.bru index 7df76a733..d3c1ced5b 100644 --- a/Requests/IssuerService/Admin API/CredentialDefinitions/create Credential Definition.bru +++ b/Requests/IssuerService/Admin API/CredentialDefinitions/create Credential Definition.bru @@ -47,7 +47,7 @@ body:json { } ], "validity": "", - "formats": ["VC1_0_JWT"] + "formats": ["VC2_0_JOSE"] } } diff --git a/k8s/consumer/application/identityhub-seed.yaml b/k8s/consumer/application/identityhub-seed.yaml index 833a30e66..0fc12f56b 100644 --- a/k8s/consumer/application/identityhub-seed.yaml +++ b/k8s/consumer/application/identityhub-seed.yaml @@ -214,12 +214,12 @@ spec: \"issuerDid\": \"did:web:issuerservice.issuer.svc.cluster.local%3A10016:issuer\", \"holderPid\": \"${HOLDER_PID}\", \"credentials\": [{ - \"format\": \"VC1_0_JWT\", + \"format\": \"VC2_0_JOSE\", \"type\": \"MembershipCredential\", \"id\": \"membership-credential-def\" }, { - \"format\": \"VC1_0_JWT\", + \"format\": \"VC2_0_JOSE\", \"type\": \"ManufacturerCredential\", \"id\": \"manufacturer-credential-def\" }] diff --git a/k8s/issuer/application/issuerservice-seed-job.yaml b/k8s/issuer/application/issuerservice-seed-job.yaml index a867a2231..fabcfcf59 100644 --- a/k8s/issuer/application/issuerservice-seed-job.yaml +++ b/k8s/issuer/application/issuerservice-seed-job.yaml @@ -272,10 +272,15 @@ spec: "input": "membershipStartDate", "output": "credentialSubject.membershipStartDate", "required": true + }, + { + "input": "id", + "output": "credentialSubject.id", + "required": true } ], "rules": [], - "format": "VC1_0_JWT", + "format": "VC2_0_JOSE", "validity": "604800" }' @@ -304,10 +309,15 @@ spec: "input": "since", "output": "credentialSubject.since", "required": true + }, + { + "input": "id", + "output": "credentialSubject.id", + "required": true } ], "rules": [], - "format": "VC1_0_JWT", + "format": "VC2_0_JOSE", "validity": "604800" }' diff --git a/k8s/provider/application/identityhub-seed.yaml b/k8s/provider/application/identityhub-seed.yaml index 068cc237f..4c4842249 100644 --- a/k8s/provider/application/identityhub-seed.yaml +++ b/k8s/provider/application/identityhub-seed.yaml @@ -214,12 +214,12 @@ spec: \"issuerDid\": \"did:web:issuerservice.issuer.svc.cluster.local%3A10016:issuer\", \"holderPid\": \"${HOLDER_PID}\", \"credentials\": [{ - \"format\": \"VC1_0_JWT\", + \"format\": \"VC2_0_JOSE\", \"type\": \"MembershipCredential\", \"id\": \"membership-credential-def\" }, { - \"format\": \"VC1_0_JWT\", + \"format\": \"VC2_0_JOSE\", \"type\": \"ManufacturerCredential\", \"id\": \"manufacturer-credential-def\" }] diff --git a/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/issuance/CredentialIssuanceEndToEndTest.java b/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/issuance/CredentialIssuanceEndToEndTest.java index 02411209d..042f9b003 100644 --- a/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/issuance/CredentialIssuanceEndToEndTest.java +++ b/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/issuance/CredentialIssuanceEndToEndTest.java @@ -72,7 +72,7 @@ void makeCredentialRequest_expectCredential() { "issuerDid": "%s", "holderPid": "%s", "credentials": [ - {"format": "VC1_0_JWT", "type": "MembershipCredential", "id": "membership-credential-def"} + {"format": "VC2_0_JOSE", "type": "MembershipCredential", "id": "membership-credential-def"} ] } """.formatted(ISSUER_DID, HOLDER_PID))