From 84225ff0307c947dfc0bea7c3b889ffa3c90f69f Mon Sep 17 00:00:00 2001
From: Dennis Brandl <dnbrandl@brlconsulting.com>
Date: Mon, 20 Mar 2023 10:42:22 -0400
Subject: [PATCH] Manual changes from Arno's changes

I reimplemented Arno's changes in order to pick up the changes for the JSON file, since the attempt to merge did not have the latest changes.   See https://github.com/MESAInternational/B2MML-BatchML/pull/85/files for Arno's changes.
---
 Schema/AllSchemas.json                 | 15 +++++++++++++++
 Schema/B2MML-WorkDefinition.xsd        |  2 ++
 Schema/B2MML-WorkflowSpecification.xsd |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/Schema/AllSchemas.json b/Schema/AllSchemas.json
index 219dbfe..c12ad93 100644
--- a/Schema/AllSchemas.json
+++ b/Schema/AllSchemas.json
@@ -42764,6 +42764,9 @@
 				"WorkMasterID": {
 					"$ref": "#/$defs/IdentifierType"
 				},
+				"WorkMasterVersion": {
+					"$ref": "#/$defs/IdentifierType"
+				},
 				"WorkType": {
 					"$ref": "#/$defs/OperationsTypeType"
 				},
@@ -43953,12 +43956,24 @@
 					},
 					"type": "array"
 				},
+				"WorkDirectiveVersion": {
+					"items": {
+						"$ref": "#/$defs/IdentifierType"
+					},
+					"type": "array"
+				},
 				"WorkMasterID": {
 					"items": {
 						"$ref": "#/$defs/IdentifierType"
 					},
 					"type": "array"
 				},
+				"WorkMasterVersion": {
+					"items": {
+						"$ref": "#/$defs/IdentifierType"
+					},
+					"type": "array"
+				},
 				"WorkflowSpecification": {
 					"$ref": "#/$defs/WorkflowSpecificationType"
 				},
diff --git a/Schema/B2MML-WorkDefinition.xsd b/Schema/B2MML-WorkDefinition.xsd
index e51e1f3..a0ef1c6 100644
--- a/Schema/B2MML-WorkDefinition.xsd
+++ b/Schema/B2MML-WorkDefinition.xsd
@@ -175,6 +175,8 @@
     <xsd:sequence>
       <xsd:group   ref  = "WorkDefinitionType"/>
       <xsd:element name = "WorkMasterID"                type = "IdentifierType"/>
+      <xsd:element name = "WorkMasterVersion"           type = "IdentifierType"
+														minOccurs = "0"/>
       <xsd:element name = "WorkDirectiveChild"          type = "WorkDirectiveType"
                                                         minOccurs = "0" maxOccurs = "unbounded"/>
       <xsd:element name = "WorkDirectiveState"          type = "ResponseStateType"
diff --git a/Schema/B2MML-WorkflowSpecification.xsd b/Schema/B2MML-WorkflowSpecification.xsd
index a16f9c8..bffc6e0 100644
--- a/Schema/B2MML-WorkflowSpecification.xsd
+++ b/Schema/B2MML-WorkflowSpecification.xsd
@@ -170,8 +170,12 @@
                                                         minOccurs = "0"/>
       <xsd:element name = "WorkMasterID"                type = "IdentifierType"
                                                         minOccurs = "0" maxOccurs = "unbounded"/>
+      <xsd:element name = "WorkMasterVersion"           type = "IdentifierType"
+                                                        minOccurs = "0" maxOccurs = "unbounded"/>
       <xsd:element name = "WorkDirectiveID"             type = "IdentifierType"
                                                         minOccurs = "0" maxOccurs = "unbounded"/>
+      <xsd:element name = "WorkDirectiveVersion"        type = "IdentifierType"
+                                                        minOccurs = "0" maxOccurs = "unbounded"/>
       <xsd:element name = "WorkflowSpecifictionNodeProperty"
                                                         type = "WorkflowSpecificationNodePropertyType"
                                                         minOccurs = "0" maxOccurs = "unbounded"/>