eclipse-dataspace-dcp · arnoweiss · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024
diff --git a/.github/workflows/autopublish.yaml b/.github/workflows/autopublish.yaml
@@ -22,8 +22,8 @@ jobs:
         run: |
           cp specifications/*.png .
           cp specifications/*.yaml .
-          mkdir -p resources/v0.8
-          cp -r artifacts/src/main/resources/* resources/v0.8
+          mkdir -p resources/v1.0
+          cp -r artifacts/src/main/resources/* resources/v1.0
           rm -rf artifacts
       - name: Run Respec
         run:

diff --git a/artifacts/src/main/java/org/eclipse/dcp/schema/SchemaConstants.java b/artifacts/src/main/java/org/eclipse/dcp/schema/SchemaConstants.java
@@ -19,7 +19,7 @@
  */
 public interface SchemaConstants {
 
-    String DCP_CONTEXT = "https://w3id.org/dspace-dcp/v0.8";
-    String DCP_PREFIX = "https://w3id.org/dspace-dcp/v0.8/";
+    String DCP_CONTEXT = "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld";
+    String DCP_PREFIX = "https://w3id.org/dspace-dcp/v1.0/";
 
 }
diff --git a/artifacts/src/main/resources/common/context-schema.json b/artifacts/src/main/resources/common/context-schema.json
@@ -18,7 +18,7 @@
         }
       },
       "contains": {
-        "const": "https://w3id.org/dspace-dcp/v0.8"
+        "const": "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
       }
     }
   }

diff --git a/artifacts/src/main/resources/context/dcp.jsonld b/artifacts/src/main/resources/context/dcp.jsonld
@@ -2,7 +2,7 @@
   "@context": {
     "@version": 1.1,
     "@protected": true,
-    "dcp": "https://w3id.org/dspace-dcp/v0.8/",
+    "dcp": "https://w3id.org/dspace-dcp/v1.0/",
     "cred": "https://www.w3.org/2018/credentials/",
     "xsd": "http://www.w3.org/2001/XMLSchema#",
     "id": "@id",
@@ -53,7 +53,7 @@
         },
         "issuancePolicy": {
           "@id": "dcp:issuancePolicy",
-          "@type":"@json"
+          "@type": "@json"
         }
       }
     },

diff --git a/artifacts/src/main/resources/issuance/credential-message-schema.json b/artifacts/src/main/resources/issuance/credential-message-schema.json
@@ -7,18 +7,18 @@
       "$ref": "#/definitions/CredentialMessage"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/presentation/credential-message-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/presentation/credential-message-schema.json",
   "definitions": {
     "CredentialMessage": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "credentials": {
           "type": "array",
           "items": {
-            "$ref": "https://w3id.org/dspace-dcp/v0.8/presentation/credential-message-schema.json#/definitions/CredentialContainer"
+            "$ref": "https://w3id.org/dspace-dcp/v1.0/presentation/credential-message-schema.json#/definitions/CredentialContainer"
           }
         },
         "requestId": {

diff --git a/artifacts/src/main/resources/issuance/credential-object-schema.json b/artifacts/src/main/resources/issuance/credential-object-schema.json
@@ -7,7 +7,7 @@
       "$ref": "#/definitions/CredentialObject"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-object-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-object-schema.json",
   "definitions": {
     "CredentialObject": {
       "type": "object",

diff --git a/artifacts/src/main/resources/issuance/credential-offer-message-schema.json b/artifacts/src/main/resources/issuance/credential-offer-message-schema.json
@@ -7,21 +7,21 @@
       "$ref": "#/definitions/CredentialOfferMessage"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-offer-message-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-offer-message-schema.json",
   "definitions": {
     "CredentialOfferMessage": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "credentialIssuer": {
           "type": "string"
         },
         "credentials": {
           "type": "array",
           "items": {
-            "$ref": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-object-schema.json#/definitions/CredentialObject"
+            "$ref": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-object-schema.json#/definitions/CredentialObject"
           }
         },
         "type": {

diff --git a/artifacts/src/main/resources/issuance/credential-request-message-schema.json b/artifacts/src/main/resources/issuance/credential-request-message-schema.json
@@ -7,13 +7,13 @@
       "$ref": "#/definitions/CredentialRequestMessage"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-request-message-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-request-message-schema.json",
   "definitions": {
     "CredentialRequestMessage": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "format": {
           "type": "string"

diff --git a/artifacts/src/main/resources/issuance/credential-status-schema.json b/artifacts/src/main/resources/issuance/credential-status-schema.json
@@ -7,7 +7,7 @@
       "$ref": "#/definitions/CredentialStatus"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-status-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-status-schema.json",
   "definitions": {
     "CredentialStatusClass": {
       "type": "object",
@@ -43,7 +43,7 @@
         {
           "properties": {
             "@context": {
-              "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+              "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
             }
           },
           "required": [

diff --git a/artifacts/src/main/resources/issuance/example/credential-message.json b/artifacts/src/main/resources/issuance/example/credential-message.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8"
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
   ],
   "type": "CredentialMessage",
   "credentials": [

diff --git a/artifacts/src/main/resources/issuance/example/credential-object.json b/artifacts/src/main/resources/issuance/example/credential-object.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8",
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld",
     "https://www.w3.org/2018/credentials/v1",
     "https://www.w3.org/2018/credentials/examples/v1"
   ],

diff --git a/artifacts/src/main/resources/issuance/example/credential-offer-message.json b/artifacts/src/main/resources/issuance/example/credential-offer-message.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8",
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld",
     "https://www.w3.org/2018/credentials/v1",
     "https://www.w3.org/2018/credentials/examples/v1"
   ],
@@ -19,7 +19,10 @@
         "did:web"
       ],
       "cryptography": [
-        "JsonWebSignature2020", "eddsa-rdfc-2022", "eddsa-jcs-2022", "..."
+        "JsonWebSignature2020",
+        "eddsa-rdfc-2022",
+        "eddsa-jcs-2022",
+        "..."
       ],
       "issuancePolicy": {
         "id": "Scalable trust example",

diff --git a/artifacts/src/main/resources/issuance/example/credential-request-message.json b/artifacts/src/main/resources/issuance/example/credential-request-message.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8",
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld",
     "https://www.w3.org/2018/credentials/v1",
     "https://www.w3.org/2018/credentials/examples/v1"
   ],

diff --git a/artifacts/src/main/resources/issuance/example/credential-status.json b/artifacts/src/main/resources/issuance/example/credential-status.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8"
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
   ],
   "type": "CredentialStatus",
   "requestId": "requestId",

diff --git a/artifacts/src/main/resources/issuance/example/issuer-metadata.json b/artifacts/src/main/resources/issuance/example/issuer-metadata.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8",
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld",
     "https://www.w3.org/2018/credentials/v1",
     "https://www.w3.org/2018/credentials/examples/v1"
   ],
@@ -18,7 +18,10 @@
         "did:web"
       ],
       "cryptography": [
-        "JsonWebSignature2020", "eddsa-rdfc-2022", "eddsa-jcs-2022", "..."
+        "JsonWebSignature2020",
+        "eddsa-rdfc-2022",
+        "eddsa-jcs-2022",
+        "..."
       ],
       "issuancePolicy": {
         "id": "Scalable trust example",

diff --git a/artifacts/src/main/resources/issuance/issuer-metadata-schema.json b/artifacts/src/main/resources/issuance/issuer-metadata-schema.json
@@ -7,18 +7,18 @@
       "$ref": "#/definitions/IssuerMetadata"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/issuance/issuer-metadata-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/issuance/issuer-metadata-schema.json",
   "definitions": {
     "IssuerMetadata": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "credentialsSupported": {
           "type": "array",
           "items": {
-            "$ref": "https://w3id.org/dspace-dcp/v0.8/issuance/credential-object-schema.json#/definitions/CredentialObject"
+            "$ref": "https://w3id.org/dspace-dcp/v1.0/issuance/credential-object-schema.json#/definitions/CredentialObject"
           }
         },
         "type": {

diff --git a/.../resources/presentation/example/presentation-query-message-w-presentation-definition.json b/.../resources/presentation/example/presentation-query-message-w-presentation-definition.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8"
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
   ],
   "type": "PresentationQueryMessage",
   "presentationDefinition": {

diff --git a/artifacts/src/main/resources/presentation/example/presentation-query-message.json b/artifacts/src/main/resources/presentation/example/presentation-query-message.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8"
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
   ],
   "type": "PresentationQueryMessage",
   "scope": [

diff --git a/artifacts/src/main/resources/presentation/example/presentation-response-message.json b/artifacts/src/main/resources/presentation/example/presentation-response-message.json
@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://w3id.org/dspace-dcp/v0.8"
+    "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
   ],
   "type": "PresentationResponseMessage",
   "presentation": [

diff --git a/artifacts/src/main/resources/presentation/presentation-query-message-schema.json b/artifacts/src/main/resources/presentation/presentation-query-message-schema.json
@@ -7,13 +7,13 @@
       "$ref": "#/definitions/PresentationQueryMessage"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/presentation/presentation-query-message-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/presentation/presentation-query-message-schema.json",
   "definitions": {
     "PresentationQueryMessage": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "type": {
           "type": "string",

diff --git a/artifacts/src/main/resources/presentation/presentation-response-message-schema.json b/artifacts/src/main/resources/presentation/presentation-response-message-schema.json
@@ -7,13 +7,13 @@
       "$ref": "#/definitions/PresentationResponseMessage"
     }
   ],
-  "$id": "https://w3id.org/dspace-dcp/v0.8/presentation/presentation-response-message-schema.json",
+  "$id": "https://w3id.org/dspace-dcp/v1.0/presentation/presentation-response-message-schema.json",
   "definitions": {
     "PresentationResponseMessage": {
       "type": "object",
       "properties": {
         "@context": {
-          "$ref": "https://w3id.org/dspace-dcp/v0.8/common/context-schema.json"
+          "$ref": "https://w3id.org/dspace-dcp/v1.0/common/context-schema.json"
         },
         "presentation": {
           "type": "array",

diff --git a/artifacts/src/test/java/org/eclipse/dcp/context/issuance/IssuanceContextTest.java b/artifacts/src/test/java/org/eclipse/dcp/context/issuance/IssuanceContextTest.java
@@ -54,7 +54,7 @@ void verifyCredentialStatus() {
     void verifyCredentialStatus_withStatus(String status) throws IOException {
         var msg = """
                 {
-                    "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+                    "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
                     "type": "CredentialStatus",
                     "requestId": "requestId",
                     "status": "%s"

diff --git a/artifacts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialMessageSchemaTest.java b/artifacts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialMessageSchemaTest.java
@@ -26,7 +26,7 @@ public class CredentialMessageSchemaTest extends AbstractSchemaTest {
     private static final String CREDENTIAL_MESSAGE_MESSAGE = """
             {
                "@context": [
-                 "https://w3id.org/dspace-dcp/v0.8"
+                 "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
                ],
                "type": "CredentialMessage",
                "credentials": [
@@ -40,13 +40,13 @@ public class CredentialMessageSchemaTest extends AbstractSchemaTest {
 
     private static final String INVALID_CREDENTIAL_MESSAGE = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialMessage"
             }""";
 
     private static final String INVALID_CREDENTIAL_MESSAGE_INVALID_CREDENTIAL_CONTAINER = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialMessage",
               "credentials": [
                  {

diff --git a/...facts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialOfferMessageSchemaTest.java b/...facts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialOfferMessageSchemaTest.java
@@ -26,22 +26,22 @@ public class CredentialOfferMessageSchemaTest extends AbstractSchemaTest {
 
     private static final String CREDENTIAL_OFFER_MESSAGE = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialOfferMessage",
               "credentialIssuer": "issuer",
               "credentials": [%s]
             }""";
 
     private static final String INVALID_CREDENTIAL_REQUEST_MESSAGE_NO_CREDENTIAL_ISSUER = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialOfferMessage",
               "credentials": [%s]
             }""";
 
     private static final String INVALID_CREDENTIAL_REQUEST_MESSAGE_NO_CREDENTIALS = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialOfferMessage",
               "credentialIssuer": "issuer"
             }""";

diff --git a/...cts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialRequestMessageSchemaTest.java b/...cts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialRequestMessageSchemaTest.java
@@ -25,22 +25,22 @@ public class CredentialRequestMessageSchemaTest extends AbstractSchemaTest {
 
     private static final String CREDENTIAL_REQUEST_MESSAGE = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialRequestMessage",
               "format": "jwt",
               "credentialType": ["VerifiableCredential"]
             }""";
 
     private static final String INVALID_CREDENTIAL_REQUEST_MESSAGE_NO_FORMAT = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialRequestMessage",
               "credentialType": ["VerifiableCredential"]
             }""";
 
     private static final String INVALID_CREDENTIAL_REQUEST_MESSAGE_NO_CREDENTIAL_TYPE = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialRequestMessage",
               "format": "jwt"
             }""";

diff --git a/artifacts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialStatusSchemaTest.java b/artifacts/src/test/java/org/eclipse/dcp/schema/issuance/CredentialStatusSchemaTest.java
@@ -27,15 +27,15 @@ public class CredentialStatusSchemaTest extends AbstractSchemaTest {
 
     private static final String CREDENTIAL_STATUS = """
             {
-                "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+                "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
                 "type": "CredentialStatus",
                 "requestId": "requestId",
                 "status": "%s"
             }""";
 
     private static final String INVALID_CREDENTIAL_STATUS = """
             {
-              "@context": ["https://w3id.org/dspace-dcp/v0.8"],
+              "@context": ["https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"],
               "type": "CredentialStatus"
             }""";
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
             }
           },
           "contains": {
-            "const": "https://w3id.org/dspace-dcp/v0.8"
+            "const": "https://w3id.org/dspace-dcp/v1.0/dcp.jsonld"
           }
         }
       }
@@ Expand Down @@