From ae6190811297cbc196bd0af644575f5f197a923f Mon Sep 17 00:00:00 2001
From: RS-Credentive <robert.sherwood@credentive.com>
Date: Fri, 21 Jul 2023 08:13:21 -0400
Subject: [PATCH 1/4] Fixes #400

---
 schema/xml/metaschema-datatypes.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/xml/metaschema-datatypes.xsd b/schema/xml/metaschema-datatypes.xsd
index ff4ea8e22..3bec96536 100644
--- a/schema/xml/metaschema-datatypes.xsd
+++ b/schema/xml/metaschema-datatypes.xsd
@@ -26,7 +26,7 @@
 			<xs:documentation>A string representing a 24-hour period with an optional timezone.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:date">
-			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?"/>
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|([+|-])([0-1][0-9]|2[0-3]):([0-5][0-9]))?"/>
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -35,7 +35,7 @@
 			<xs:documentation>A string representing a 24-hour period with a required timezone.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="DateDatatype">
-			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})"/>
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|([+|-])([0-1][0-9]|2[0-3]):([0-5][0-9]))"/>
 		</xs:restriction>
 	</xs:simpleType>
 	

From b4c5f38b64a739175b5a0335c75ae0a54c976451 Mon Sep 17 00:00:00 2001
From: RS-Credentive <robert.sherwood@credentive.com>
Date: Mon, 24 Jul 2023 14:05:14 -0400
Subject: [PATCH 2/4] Updated json date types to match xml date types

---
 schema/json/metaschema-datatypes.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/json/metaschema-datatypes.json b/schema/json/metaschema-datatypes.json
index c663d6e85..e20591687 100644
--- a/schema/json/metaschema-datatypes.json
+++ b/schema/json/metaschema-datatypes.json
@@ -17,12 +17,12 @@
     "DateDatatype": {
       "description": "A string representing a 24-hour period with an optional timezone.",
       "type": "string",
-      "pattern": "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?$"
+      "pattern": "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))?$"
     },
     "DateWithTimezoneDatatype": {
       "description": "A string representing a 24-hour period with a required timezone.",
       "type": "string",
-      "pattern": "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})$"
+      "pattern": "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$"
     },
     "DateTimeDatatype": {
       "description": "A string representing a point in time with an optional timezone.",

From d5b1a5f72e9d39ea9452972d7d135ffd6e31b8ce Mon Sep 17 00:00:00 2001
From: Robert Sherwood <122729488+RS-Credentive@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:15:37 -0400
Subject: [PATCH 3/4] Update schema/xml/metaschema-datatypes.xsd

Corrected TZ pattern

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
---
 schema/xml/metaschema-datatypes.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/xml/metaschema-datatypes.xsd b/schema/xml/metaschema-datatypes.xsd
index 3bec96536..2044f3523 100644
--- a/schema/xml/metaschema-datatypes.xsd
+++ b/schema/xml/metaschema-datatypes.xsd
@@ -35,7 +35,7 @@
 			<xs:documentation>A string representing a 24-hour period with a required timezone.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="DateDatatype">
-			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|([+|-])([0-1][0-9]|2[0-3]):([0-5][0-9]))"/>
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))"/>
 		</xs:restriction>
 	</xs:simpleType>
 	

From 19893d2d98f5bc114c6f2fdfe12de27f99645ea9 Mon Sep 17 00:00:00 2001
From: Robert Sherwood <122729488+RS-Credentive@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:18:21 -0400
Subject: [PATCH 4/4] Update schema/xml/metaschema-datatypes.xsd

Corrected regex for TZ in Date

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
---
 schema/xml/metaschema-datatypes.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/xml/metaschema-datatypes.xsd b/schema/xml/metaschema-datatypes.xsd
index 2044f3523..ef0548039 100644
--- a/schema/xml/metaschema-datatypes.xsd
+++ b/schema/xml/metaschema-datatypes.xsd
@@ -26,7 +26,7 @@
 			<xs:documentation>A string representing a 24-hour period with an optional timezone.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:date">
-			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|([+|-])([0-1][0-9]|2[0-3]):([0-5][0-9]))?"/>
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))?"/>
 		</xs:restriction>
 	</xs:simpleType>