diff --git a/schemas/2020-12/ietf/http/etag-strong.json b/schemas/2020-12/ietf/http/9110/etag-strong.json similarity index 100% rename from schemas/2020-12/ietf/http/etag-strong.json rename to schemas/2020-12/ietf/http/9110/etag-strong.json diff --git a/schemas/2020-12/ietf/http/etag-weak.json b/schemas/2020-12/ietf/http/9110/etag-weak.json similarity index 100% rename from schemas/2020-12/ietf/http/etag-weak.json rename to schemas/2020-12/ietf/http/9110/etag-weak.json diff --git a/schemas/2020-12/ietf/http/etag.json b/schemas/2020-12/ietf/http/9110/etag.json similarity index 100% rename from schemas/2020-12/ietf/http/etag.json rename to schemas/2020-12/ietf/http/9110/etag.json diff --git a/schemas/2020-12/ietf/http/http-url.json b/schemas/2020-12/ietf/http/9110/http-url.json similarity index 94% rename from schemas/2020-12/ietf/http/http-url.json rename to schemas/2020-12/ietf/http/9110/http-url.json index bfe4c559..eda1e0f0 100644 --- a/schemas/2020-12/ietf/http/http-url.json +++ b/schemas/2020-12/ietf/http/9110/http-url.json @@ -9,7 +9,7 @@ ], "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE", "x-links": [ "https://www.rfc-editor.org/rfc/rfc9110#section-4.2.1" ], - "$ref": "../uri/url.json", + "$ref": "../../uri/3986/url.json", "not": { "$comment": "RFC 9110 requires rejecting an empty host", "pattern": "^[Hh][Tt][Tt][Pp]://(?:[^/?#]*@)?(?::[0-9]*)?(?:[/?#]|$)" diff --git a/schemas/2020-12/ietf/http/https-url.json b/schemas/2020-12/ietf/http/9110/https-url.json similarity index 94% rename from schemas/2020-12/ietf/http/https-url.json rename to schemas/2020-12/ietf/http/9110/https-url.json index 1514ea81..cf3b64e0 100644 --- a/schemas/2020-12/ietf/http/https-url.json +++ b/schemas/2020-12/ietf/http/9110/https-url.json @@ -9,7 +9,7 @@ ], "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE", "x-links": [ "https://www.rfc-editor.org/rfc/rfc9110#section-4.2.2" ], - "$ref": "../uri/url.json", + "$ref": "../../uri/3986/url.json", "not": { "$comment": "RFC 9110 requires rejecting an empty host", "pattern": "^[Hh][Tt][Tt][Pp][Ss]://(?:[^/?#]*@)?(?::[0-9]*)?(?:[/?#]|$)" diff --git a/schemas/2020-12/ietf/http/method-standard.json b/schemas/2020-12/ietf/http/9110/method-standard.json similarity index 100% rename from schemas/2020-12/ietf/http/method-standard.json rename to schemas/2020-12/ietf/http/9110/method-standard.json diff --git a/schemas/2020-12/ietf/http/method.json b/schemas/2020-12/ietf/http/9110/method.json similarity index 100% rename from schemas/2020-12/ietf/http/method.json rename to schemas/2020-12/ietf/http/9110/method.json diff --git a/schemas/2020-12/ietf/http/status-client-error.json b/schemas/2020-12/ietf/http/9110/status-client-error.json similarity index 100% rename from schemas/2020-12/ietf/http/status-client-error.json rename to schemas/2020-12/ietf/http/9110/status-client-error.json diff --git a/schemas/2020-12/ietf/http/status-informational.json b/schemas/2020-12/ietf/http/9110/status-informational.json similarity index 100% rename from schemas/2020-12/ietf/http/status-informational.json rename to schemas/2020-12/ietf/http/9110/status-informational.json diff --git a/schemas/2020-12/ietf/http/status-redirection.json b/schemas/2020-12/ietf/http/9110/status-redirection.json similarity index 100% rename from schemas/2020-12/ietf/http/status-redirection.json rename to schemas/2020-12/ietf/http/9110/status-redirection.json diff --git a/schemas/2020-12/ietf/http/status-server-error.json b/schemas/2020-12/ietf/http/9110/status-server-error.json similarity index 100% rename from schemas/2020-12/ietf/http/status-server-error.json rename to schemas/2020-12/ietf/http/9110/status-server-error.json diff --git a/schemas/2020-12/ietf/http/status-standard.json b/schemas/2020-12/ietf/http/9110/status-standard.json similarity index 100% rename from schemas/2020-12/ietf/http/status-standard.json rename to schemas/2020-12/ietf/http/9110/status-standard.json diff --git a/schemas/2020-12/ietf/http/status-successful.json b/schemas/2020-12/ietf/http/9110/status-successful.json similarity index 100% rename from schemas/2020-12/ietf/http/status-successful.json rename to schemas/2020-12/ietf/http/9110/status-successful.json diff --git a/schemas/2020-12/ietf/http/status.json b/schemas/2020-12/ietf/http/9110/status.json similarity index 100% rename from schemas/2020-12/ietf/http/status.json rename to schemas/2020-12/ietf/http/9110/status.json diff --git a/schemas/2020-12/ietf/uri/iri-reference.json b/schemas/2020-12/ietf/iri/3987/iri-reference.json similarity index 100% rename from schemas/2020-12/ietf/uri/iri-reference.json rename to schemas/2020-12/ietf/iri/3987/iri-reference.json diff --git a/schemas/2020-12/ietf/uri/iri.json b/schemas/2020-12/ietf/iri/3987/iri.json similarity index 100% rename from schemas/2020-12/ietf/uri/iri.json rename to schemas/2020-12/ietf/iri/3987/iri.json diff --git a/schemas/2020-12/ietf/problem-details/9457/problem.json b/schemas/2020-12/ietf/problem-details/9457/problem.json index 1faab985..601ef75f 100644 --- a/schemas/2020-12/ietf/problem-details/9457/problem.json +++ b/schemas/2020-12/ietf/problem-details/9457/problem.json @@ -45,7 +45,7 @@ "type": { "description": "A URI reference that identifies the problem type", "default": "about:blank", - "$ref": "../../uri/uri-reference.json" + "$ref": "../../uri/3986/uri-reference.json" }, "detail": { "description": "A human-readable explanation specific to this occurrence of the problem", @@ -54,12 +54,12 @@ }, "instance": { "description": "A URI reference that identifies the specific occurrence of the problem", - "$ref": "../../uri/uri-reference.json" + "$ref": "../../uri/3986/uri-reference.json" }, "status": { "description": "The HTTP status code generated by the origin server for this occurrence of the problem", "x-jsonld-id": "http://www.w3.org/ns/hydra/core#statusCode", - "$ref": "../../http/status.json" + "$ref": "../../http/9110/status.json" } } } diff --git a/schemas/2020-12/ietf/uri/uri-reference.json b/schemas/2020-12/ietf/uri/3986/uri-reference.json similarity index 100% rename from schemas/2020-12/ietf/uri/uri-reference.json rename to schemas/2020-12/ietf/uri/3986/uri-reference.json diff --git a/schemas/2020-12/ietf/uri/uri-relative.json b/schemas/2020-12/ietf/uri/3986/uri-relative.json similarity index 100% rename from schemas/2020-12/ietf/uri/uri-relative.json rename to schemas/2020-12/ietf/uri/3986/uri-relative.json diff --git a/schemas/2020-12/ietf/uri/uri.json b/schemas/2020-12/ietf/uri/3986/uri.json similarity index 100% rename from schemas/2020-12/ietf/uri/uri.json rename to schemas/2020-12/ietf/uri/3986/uri.json diff --git a/schemas/2020-12/ietf/uri/url.json b/schemas/2020-12/ietf/uri/3986/url.json similarity index 100% rename from schemas/2020-12/ietf/uri/url.json rename to schemas/2020-12/ietf/uri/3986/url.json diff --git a/schemas/2020-12/ietf/uri/urn.json b/schemas/2020-12/ietf/urn/8141/urn.json similarity index 97% rename from schemas/2020-12/ietf/uri/urn.json rename to schemas/2020-12/ietf/urn/8141/urn.json index 2f127de2..ad2afa23 100644 --- a/schemas/2020-12/ietf/uri/urn.json +++ b/schemas/2020-12/ietf/urn/8141/urn.json @@ -21,7 +21,7 @@ "https://www.rfc-editor.org/rfc/rfc8141#section-2", "https://www.rfc-editor.org/rfc/rfc2141#section-2.1" ], - "$ref": "./uri.json", + "$ref": "../../uri/3986/uri.json", "not": { "$comment": "Disallow reserved NID value 'urn'", "pattern": "^[Uu][Rr][Nn]:[Uu][Rr][Nn]:" diff --git a/test/ietf/http/etag-strong.test.json b/test/ietf/http/9110/etag-strong.test.json similarity index 98% rename from test/ietf/http/etag-strong.test.json rename to test/ietf/http/9110/etag-strong.test.json index 94d53995..1398e130 100644 --- a/test/ietf/http/etag-strong.test.json +++ b/test/ietf/http/9110/etag-strong.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/etag-strong.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/etag-strong.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/etag-weak.test.json b/test/ietf/http/9110/etag-weak.test.json similarity index 98% rename from test/ietf/http/etag-weak.test.json rename to test/ietf/http/9110/etag-weak.test.json index 2a61d190..f3749d0d 100644 --- a/test/ietf/http/etag-weak.test.json +++ b/test/ietf/http/9110/etag-weak.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/etag-weak.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/etag-weak.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/etag.test.json b/test/ietf/http/9110/etag.test.json similarity index 98% rename from test/ietf/http/etag.test.json rename to test/ietf/http/9110/etag.test.json index 2ccce808..b1efd36f 100644 --- a/test/ietf/http/etag.test.json +++ b/test/ietf/http/9110/etag.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/etag.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/etag.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/http-url.test.json b/test/ietf/http/9110/http-url.test.json similarity index 98% rename from test/ietf/http/http-url.test.json rename to test/ietf/http/9110/http-url.test.json index 45daa5b2..c18871eb 100644 --- a/test/ietf/http/http-url.test.json +++ b/test/ietf/http/9110/http-url.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/http-url.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/http-url.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/https-url.test.json b/test/ietf/http/9110/https-url.test.json similarity index 98% rename from test/ietf/http/https-url.test.json rename to test/ietf/http/9110/https-url.test.json index 8e12320e..33b618cb 100644 --- a/test/ietf/http/https-url.test.json +++ b/test/ietf/http/9110/https-url.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/https-url.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/https-url.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/method-standard.test.json b/test/ietf/http/9110/method-standard.test.json similarity index 98% rename from test/ietf/http/method-standard.test.json rename to test/ietf/http/9110/method-standard.test.json index 84225b1f..ff260b22 100644 --- a/test/ietf/http/method-standard.test.json +++ b/test/ietf/http/9110/method-standard.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/method-standard.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/method-standard.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/method.test.json b/test/ietf/http/9110/method.test.json similarity index 99% rename from test/ietf/http/method.test.json rename to test/ietf/http/9110/method.test.json index be25b432..0a0b9a22 100644 --- a/test/ietf/http/method.test.json +++ b/test/ietf/http/9110/method.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/method.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/method.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/http/status-client-error.test.json b/test/ietf/http/9110/status-client-error.test.json similarity index 97% rename from test/ietf/http/status-client-error.test.json rename to test/ietf/http/9110/status-client-error.test.json index c95c9923..120d0ef7 100644 --- a/test/ietf/http/status-client-error.test.json +++ b/test/ietf/http/9110/status-client-error.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-client-error.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-client-error.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status-informational.test.json b/test/ietf/http/9110/status-informational.test.json similarity index 93% rename from test/ietf/http/status-informational.test.json rename to test/ietf/http/9110/status-informational.test.json index 931352e2..3e1787c6 100644 --- a/test/ietf/http/status-informational.test.json +++ b/test/ietf/http/9110/status-informational.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-informational.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-informational.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status-redirection.test.json b/test/ietf/http/9110/status-redirection.test.json similarity index 95% rename from test/ietf/http/status-redirection.test.json rename to test/ietf/http/9110/status-redirection.test.json index dc9831ea..f660f57b 100644 --- a/test/ietf/http/status-redirection.test.json +++ b/test/ietf/http/9110/status-redirection.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-redirection.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-redirection.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status-server-error.test.json b/test/ietf/http/9110/status-server-error.test.json similarity index 95% rename from test/ietf/http/status-server-error.test.json rename to test/ietf/http/9110/status-server-error.test.json index c44664db..fefa4d53 100644 --- a/test/ietf/http/status-server-error.test.json +++ b/test/ietf/http/9110/status-server-error.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-server-error.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-server-error.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status-standard.test.json b/test/ietf/http/9110/status-standard.test.json similarity index 98% rename from test/ietf/http/status-standard.test.json rename to test/ietf/http/9110/status-standard.test.json index 36f5ff63..8c625648 100644 --- a/test/ietf/http/status-standard.test.json +++ b/test/ietf/http/9110/status-standard.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-standard.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-standard.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status-successful.test.json b/test/ietf/http/9110/status-successful.test.json similarity index 95% rename from test/ietf/http/status-successful.test.json rename to test/ietf/http/9110/status-successful.test.json index 21160813..650884f8 100644 --- a/test/ietf/http/status-successful.test.json +++ b/test/ietf/http/9110/status-successful.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status-successful.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status-successful.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/http/status.test.json b/test/ietf/http/9110/status.test.json similarity index 98% rename from test/ietf/http/status.test.json rename to test/ietf/http/9110/status.test.json index 4bc09a18..851b1597 100644 --- a/test/ietf/http/status.test.json +++ b/test/ietf/http/9110/status.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/http/status.json", + "target": "../../../../schemas/2020-12/ietf/http/9110/status.json", "tests": [ { "description": "Invalid type - string", diff --git a/test/ietf/uri/iri-reference.test.json b/test/ietf/iri/3987/iri-reference.test.json similarity index 96% rename from test/ietf/uri/iri-reference.test.json rename to test/ietf/iri/3987/iri-reference.test.json index 5528c2eb..0829cc8b 100644 --- a/test/ietf/uri/iri-reference.test.json +++ b/test/ietf/iri/3987/iri-reference.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/iri-reference.json", + "target": "../../../../schemas/2020-12/ietf/iri/3987/iri-reference.json", "tests": [ { "description": "Plain ASCII absolute URI", diff --git a/test/ietf/uri/iri.test.json b/test/ietf/iri/3987/iri.test.json similarity index 97% rename from test/ietf/uri/iri.test.json rename to test/ietf/iri/3987/iri.test.json index 2e9bd414..fe71da59 100644 --- a/test/ietf/uri/iri.test.json +++ b/test/ietf/iri/3987/iri.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/iri.json", + "target": "../../../../schemas/2020-12/ietf/iri/3987/iri.json", "tests": [ { "description": "Plain ASCII absolute URI", diff --git a/test/ietf/uri/uri-reference.test.json b/test/ietf/uri/3986/uri-reference.test.json similarity index 99% rename from test/ietf/uri/uri-reference.test.json rename to test/ietf/uri/3986/uri-reference.test.json index 9ba9a263..cad8e1cd 100644 --- a/test/ietf/uri/uri-reference.test.json +++ b/test/ietf/uri/3986/uri-reference.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/uri-reference.json", + "target": "../../../../schemas/2020-12/ietf/uri/3986/uri-reference.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/uri/uri-relative.test.json b/test/ietf/uri/3986/uri-relative.test.json similarity index 98% rename from test/ietf/uri/uri-relative.test.json rename to test/ietf/uri/3986/uri-relative.test.json index 7e8920c6..6181d98f 100644 --- a/test/ietf/uri/uri-relative.test.json +++ b/test/ietf/uri/3986/uri-relative.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/uri-relative.json", + "target": "../../../../schemas/2020-12/ietf/uri/3986/uri-relative.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/uri/uri.test.json b/test/ietf/uri/3986/uri.test.json similarity index 99% rename from test/ietf/uri/uri.test.json rename to test/ietf/uri/3986/uri.test.json index 6661199e..1522d761 100644 --- a/test/ietf/uri/uri.test.json +++ b/test/ietf/uri/3986/uri.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/uri.json", + "target": "../../../../schemas/2020-12/ietf/uri/3986/uri.json", "tests": [ { "description": "Invalid type - number", diff --git a/test/ietf/uri/url.test.json b/test/ietf/uri/3986/url.test.json similarity index 99% rename from test/ietf/uri/url.test.json rename to test/ietf/uri/3986/url.test.json index f507a450..b29604ce 100644 --- a/test/ietf/uri/url.test.json +++ b/test/ietf/uri/3986/url.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/url.json", + "target": "../../../../schemas/2020-12/ietf/uri/3986/url.json", "tests": [ { "description": "Invalid type", diff --git a/test/ietf/uri/urn.test.json b/test/ietf/urn/8141/urn.test.json similarity index 98% rename from test/ietf/uri/urn.test.json rename to test/ietf/urn/8141/urn.test.json index d1306da7..cdfddd7b 100644 --- a/test/ietf/uri/urn.test.json +++ b/test/ietf/urn/8141/urn.test.json @@ -1,5 +1,5 @@ { - "target": "../../../schemas/2020-12/ietf/uri/urn.json", + "target": "../../../../schemas/2020-12/ietf/urn/8141/urn.json", "tests": [ { "description": "Invalid type (non-string)",