Merge branch 'main' into 195-provider-consumer-to-assigner-assignee

# Conflicts: # negotiation/message/diagram/contract-agreement-message.png
International-Data-Spaces-Association · Feb 13, 2024 · a413d37 · a413d37
2 parents b377d17 + ab7be06
commit a413d37
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/negotiation/message/diagram/contract-agreement-message.png b/negotiation/message/diagram/contract-agreement-message.png
diff --git a/negotiation/message/diagram/contract-agreement-message.puml b/negotiation/message/diagram/contract-agreement-message.puml
@@ -23,6 +23,6 @@ class odrl:Agreement {
     odrl:assigner : String
 }
 
-"dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "odrl:agreement"
+"dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "dspace:agreement"
 
 @enduml
diff --git a/negotiation/message/schema/contract-offer-message-schema.json b/negotiation/message/schema/contract-offer-message-schema.json
@@ -26,7 +26,7 @@
 				"dspace:consumerPid": {
 					"type": "string"
 				},
-				"odrl:offer": {
+				"dspace:offer": {
 					"$ref": "https://w3id.org/dspace/schemas/v0.8/contract-schema.json#/definitions/MessageOffer"
 				},
 				"dspace:callbackAddress": {

diff --git a/negotiation/message/schema/contract-request-message-schema.json b/negotiation/message/schema/contract-request-message-schema.json
@@ -26,7 +26,7 @@
 				"dspace:consumerPid": {
 					"type": "string"
 				},
-				"odrl:offer": {
+				"dspace:offer": {
 					"$ref": "https://w3id.org/dspace/schemas/v0.8/contract-schema.json#/definitions/MessageOffer"
 				},
 				"dspace:callbackAddress": {